diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-01-19 15:34:28 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-01-19 15:34:28 +0000 |
| commit | dba007553fe79b95204bb0339ac8a07e99e43327 (patch) | |
| tree | 1e85157ba97ad52e95cd1ef29ffab4572e4a91e1 /plugins | |
| parent | 23ded0507b5f4fa41a1ca46e84cc676840eb6ed9 (diff) | |
| parent | 37ba5f795f519c55a28ae6b2a7a8cb239d097545 (diff) | |
| download | prosody-dba007553fe79b95204bb0339ac8a07e99e43327.tar.gz prosody-dba007553fe79b95204bb0339ac8a07e99e43327.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_posix.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index a2a60dd0..bcef2c1d 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -112,7 +112,12 @@ local function write_pidfile() end end -local daemonize = module:get_option("daemonize", prosody.installed); +local daemonize = prosody.opts.daemonize; + +if daemonize == nil then + -- Fall back to config file if not specified on command-line + daemonize = module:get_option("daemonize", prosody.installed); +end local function remove_log_sinks() local lm = require "core.loggingmanager"; |