diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-10 13:16:54 +0200 |
commit | 87020b4789013b1d8ff33d7929d455392b1d9638 (patch) | |
tree | 521b9634144ac84ea608dbe47a15a0bcd1951695 /plugins/mod_posix.lua | |
parent | 35ef31bd9b827f325f17180dfa77a66578df0983 (diff) | |
parent | ae8a4fb909a0cce10a12e9ced65e45ef2d1495fa (diff) | |
download | prosody-87020b4789013b1d8ff33d7929d455392b1d9638.tar.gz prosody-87020b4789013b1d8ff33d7929d455392b1d9638.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_posix.lua')
-rw-r--r-- | plugins/mod_posix.lua | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 69542c96..89d6d2b6 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -129,14 +129,6 @@ end require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker); local daemonize = module:get_option("daemonize", prosody.installed); -if daemonize == nil then - local no_daemonize = module:get_option("no_daemonize"); --COMPAT w/ 0.5 - daemonize = not no_daemonize; - if no_daemonize ~= nil then - module:log("warn", "The 'no_daemonize' option is now replaced by 'daemonize'"); - module:log("warn", "Update your config from 'no_daemonize = %s' to 'daemonize = %s'", tostring(no_daemonize), tostring(daemonize)); - end -end local function remove_log_sinks() local lm = require "core.loggingmanager"; |