Diff

plugins/mod_posix.lua @ 10599:4f655918fef1

Merge 0.11->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 19 Jan 2020 15:34:28 +0000
parent 9928:d92ab8c8006a
parent 10598:5cf481bee678
child 10628:25e178edbc2c
line wrap: on
line diff
--- a/plugins/mod_posix.lua	Thu Jan 16 16:30:26 2020 +0100
+++ b/plugins/mod_posix.lua	Sun Jan 19 15:34:28 2020 +0000
@@ -112,7 +112,12 @@
 	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";