aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-01-19 15:34:28 +0000
committerMatthew Wild <mwild1@gmail.com>2020-01-19 15:34:28 +0000
commit5439531339a7b11904c3c5801acbf7d586de0fa0 (patch)
tree1e85157ba97ad52e95cd1ef29ffab4572e4a91e1 /plugins
parent3db27c369600393497d626c7b1a3e8c2c0365338 (diff)
parent4167f630b8e54b56afc15c0362382a75e2d35058 (diff)
downloadprosody-5439531339a7b11904c3c5801acbf7d586de0fa0.tar.gz
prosody-5439531339a7b11904c3c5801acbf7d586de0fa0.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_posix.lua7
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";