aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-01-19 16:01:29 +0000
committerMatthew Wild <mwild1@gmail.com>2020-01-19 16:01:29 +0000
commit94d54fd3c432cd72c437064f6f03c0cbc5fd6650 (patch)
treed2b548c8f5e03dc9d97d9cf0408ecc2eecee052f /util
parentb319d27548f116883c7ef73e65b2efc50638ae4a (diff)
parent73355a4f31286593b29cdc44cd1d03d705cf78b3 (diff)
downloadprosody-94d54fd3c432cd72c437064f6f03c0cbc5fd6650.tar.gz
prosody-94d54fd3c432cd72c437064f6f03c0cbc5fd6650.zip
Merge 0.11->trunk
Diffstat (limited to 'util')
-rw-r--r--util/startup.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/util/startup.lua b/util/startup.lua
index 6dbdd876..9b8d50f8 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -18,6 +18,7 @@ local value_params = { config = true };
function startup.parse_args()
local parsed_opts = {};
+ prosody.opts = parsed_opts;
if #arg == 0 then
return;
@@ -64,9 +65,7 @@ function startup.parse_args()
end
end
parsed_opts[param_k] = param_v;
- print("ARG", param_k, param_v);
end
- prosody.opts = parsed_opts;
end
function startup.read_config()