mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL EXTERNAL failure

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index ed64fc34350f99ff063cd9dc5fcb6f60135c5c04..c9b9f3aa03986506831fa35c29aae9bf5ddd43d7 100644 (file)
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -1,16 +1,18 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-local want_pposix_version = "0.3.5";
+local want_pposix_version = "0.3.6";
 
 local pposix = assert(require "util.pposix");
-if pposix._VERSION ~= want_pposix_version then module:log("warn", "Unknown version (%s) of binary pposix module, expected %s", tostring(pposix._VERSION), want_pposix_version); end
+if pposix._VERSION ~= want_pposix_version then
+       module:log("warn", "Unknown version (%s) of binary pposix module, expected %s. Perhaps you need to recompile?", tostring(pposix._VERSION), want_pposix_version);
+end
 
 local signal = select(2, pcall(require, "util.signal"));
 if type(signal) == "string" then
@@ -78,7 +80,7 @@ local function write_pidfile()
        if pidfile_handle then
                remove_pidfile();
        end
-       pidfile = module:get_option("pidfile");
+       pidfile = module:get_option_string("pidfile");
        if pidfile then
                local err;
                local mode = stat(pidfile) and "r+" or "w+";
@@ -118,23 +120,15 @@ function syslog_sink_maker(config)
        local syslog, format = pposix.syslog_log, string.format;
        return function (name, level, message, ...)
                if ... then
-                       syslog(level, format(message, ...));
+                       syslog(level, name, format(message, ...));
                else
-                       syslog(level, message);
+                       syslog(level, name, message);
                end
        end;
 end
 require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
 
-local daemonize = module:get_option("daemonize");
-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 daemonize = module:get_option("daemonize", prosody.installed);
 
 local function remove_log_sinks()
        local lm = require "core.loggingmanager";
@@ -145,6 +139,7 @@ end
 
 if daemonize then
        local function daemonize_server()
+               module:log("info", "Prosody is about to detach from the console, disabling further console output");
                remove_log_sinks();
                local ok, ret = pposix.daemonize();
                if not ok then
@@ -180,7 +175,7 @@ if signal.signal then
                prosody.reload_config();
                prosody.reopen_logfiles();
        end);
-       
+
        signal.signal("SIGINT", function ()
                module:log("info", "Received SIGINT");
                prosody.unlock_globals();