Software /
code /
prosody
Comparison
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 |
comparison
equal
deleted
inserted
replaced
10595:17bab303daf5 | 10599:4f655918fef1 |
---|---|
110 end | 110 end |
111 end | 111 end |
112 end | 112 end |
113 end | 113 end |
114 | 114 |
115 local daemonize = module:get_option("daemonize", prosody.installed); | 115 local daemonize = prosody.opts.daemonize; |
116 | |
117 if daemonize == nil then | |
118 -- Fall back to config file if not specified on command-line | |
119 daemonize = module:get_option("daemonize", prosody.installed); | |
120 end | |
116 | 121 |
117 local function remove_log_sinks() | 122 local function remove_log_sinks() |
118 local lm = require "core.loggingmanager"; | 123 local lm = require "core.loggingmanager"; |
119 lm.register_sink_type("console", nil); | 124 lm.register_sink_type("console", nil); |
120 lm.register_sink_type("stdout", nil); | 125 lm.register_sink_type("stdout", nil); |