mod_admin_telnet: Don't rely on getpeerchain returning an empty list

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 11985885ae2544341e7c525886a6c28feac84e5f..28fd7f382e6aa08fb5e6de8c57f33942b70c6156 100644 (file)
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -7,10 +7,12 @@
 --
 
 
-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
@@ -22,7 +24,7 @@ local stat = lfs.attributes;
 
 local prosody = _G.prosody;
 
-module.host = "*"; -- we're a global module
+module:set_global(); -- we're a global module
 
 local umask = module:get_option("umask") or "027";
 pposix.umask(umask);
@@ -34,19 +36,19 @@ module:hook("server-started", function ()
                if gid then
                        local success, msg = pposix.setgid(gid);
                        if success then
-                               module:log("debug", "Changed group to "..gid.." successfully.");
+                               module:log("debug", "Changed group to %s successfully.", gid);
                        else
-                               module:log("error", "Failed to change group to "..gid..". Error: "..msg);
-                               prosody.shutdown("Failed to change group to "..gid);
+                               module:log("error", "Failed to change group to %s. Error: %s", gid, msg);
+                               prosody.shutdown("Failed to change group to %s", gid);
                        end
                end
                if uid then
                        local success, msg = pposix.setuid(uid);
                        if success then
-                               module:log("debug", "Changed user to "..uid.." successfully.");
+                               module:log("debug", "Changed user to %s successfully.", uid);
                        else
-                               module:log("error", "Failed to change user to "..uid..". Error: "..msg);
-                               prosody.shutdown("Failed to change user to "..uid);
+                               module:log("error", "Failed to change user to %s. Error: %s", uid, msg);
+                               prosody.shutdown("Failed to change user to %s", uid);
                        end
                end
        end);
@@ -118,9 +120,9 @@ 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
@@ -136,8 +138,17 @@ if daemonize == nil then
        end
 end
 
+local function remove_log_sinks()
+       local lm = require "core.loggingmanager";
+       lm.register_sink_type("console", nil);
+       lm.register_sink_type("stdout", nil);
+       lm.reload_logging();
+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
                        module:log("error", "Failed to daemonize: %s", ret);