diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-01-19 16:01:29 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-01-19 16:01:29 +0000 |
| commit | d5ea7cef3dfb70c010b523673d64d1ce4f9577ef (patch) | |
| tree | d2b548c8f5e03dc9d97d9cf0408ecc2eecee052f | |
| parent | 65e86dbd561f55cbaf1317508dd18f088f6c9edc (diff) | |
| parent | 0b1e6fe7a719abfda49ca17413c6a567c90635a2 (diff) | |
| download | prosody-d5ea7cef3dfb70c010b523673d64d1ce4f9577ef.tar.gz prosody-d5ea7cef3dfb70c010b523673d64d1ce4f9577ef.zip | |
Merge 0.11->trunk
| -rw-r--r-- | util/startup.lua | 3 |
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() |