ejabberdsql2prosody: Display a warning if a row has more columns than expected

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index e6f17cc160315bfa42374d8eefd8116c5736d264..0f46888d0765aa3cc75469f3732d41693017070b 100644 (file)
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -1,5 +1,13 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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.0";
+
+local want_pposix_version = "0.3.1";
 
 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
@@ -12,6 +20,8 @@ end
 local config_get = require "core.configmanager".get;
 local logger_set = require "util.logger".setwriter;
 
+local prosody = _G.prosody;
+
 module.host = "*"; -- we're a global module
 
 -- Don't even think about it!
@@ -19,7 +29,7 @@ module:add_event_hook("server-starting", function ()
                if pposix.getuid() == 0 and not config_get("*", "core", "run_as_root") then
                        module:log("error", "Danger, Will Robinson! Prosody doesn't need to be run as root, so don't do it!");
                        module:log("error", "For more information on running Prosody as root, see http://prosody.im/doc/root");
-                       _G.prosody_shutdown("Refusing to run as root");
+                       prosody.shutdown("Refusing to run as root");
                end
        end);
 
@@ -86,16 +96,18 @@ end
 
 module:add_event_hook("server-stopped", remove_pidfile);
 
--- Set signal handler
+-- Set signal handlers
 if signal.signal then
        signal.signal("SIGTERM", function ()
-               module:log("warn", "Received SIGTERM...");
-               _G.unlock_globals();
-               if _G.prosody_shutdown then
-                       _G.prosody_shutdown("Received SIGTERM");
-               else
-                       module:log("warn", "...no prosody_shutdown(), ignoring.");
-               end
-               _G.lock_globals();
+               module:log("warn", "Received SIGTERM");
+               prosody.unlock_globals();
+               prosody.shutdown("Received SIGTERM");
+               prosody.lock_globals();
+       end);
+
+       signal.signal("SIGHUP", function ()
+               module:log("info", "Received SIGHUP");
+               prosody.reload_config();
+               prosody.reopen_logfiles();
        end);
 end