Merge 0.11->trunk
authorMatthew Wild <mwild1@gmail.com>
Sun, 19 Jan 2020 16:01:29 +0000
changeset 10608 3b0d9919f361
parent 10605 d8b51833926b (current diff)
parent 10607 dbd60f473164 (diff)
child 10613 f35cbfe546d1
Merge 0.11->trunk
util/startup.lua
--- a/util/startup.lua	Sun Jan 19 15:39:49 2020 +0000
+++ b/util/startup.lua	Sun Jan 19 16:01:29 2020 +0000
@@ -18,6 +18,7 @@
 
 function startup.parse_args()
 	local parsed_opts = {};
+	prosody.opts = parsed_opts;
 
 	if #arg == 0 then
 		return;
@@ -64,9 +65,7 @@
 			end
 		end
 		parsed_opts[param_k] = param_v;
-		print("ARG", param_k, param_v);
 	end
-	prosody.opts = parsed_opts;
 end
 
 function startup.read_config()