diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-23 21:35:24 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-23 21:35:24 +0100 |
| commit | e30b37c42448a4ab41333d5efaa5dd6b26242f58 (patch) | |
| tree | 9090ecffa37a7528ccaab23bf84a235120eeba30 | |
| parent | 580571ef6a072a10ba4cf0ed55efd49bb78c3dc2 (diff) | |
| download | prosody-e30b37c42448a4ab41333d5efaa5dd6b26242f58.tar.gz prosody-e30b37c42448a4ab41333d5efaa5dd6b26242f58.zip | |
mod_posix: Fix calls to log() (replace with module:log) and make some global accesses explicit
| -rw-r--r-- | plugins/mod_posix.lua | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 7fbdfa93..b1c7e01b 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -6,7 +6,7 @@ if pposix._VERSION ~= want_pposix_version then module:log("warn", "Unknown versi local signal = select(2, pcall(require, "util.signal")); if type(signal) == "string" then - log("warn", "Couldn't load signal library, won't respond to SIGTERM"); + module:log("warn", "Couldn't load signal library, won't respond to SIGTERM"); end local config_get = require "core.configmanager".get; @@ -27,11 +27,11 @@ local function write_pidfile() if pidfile_written then remove_pidfile(); end - local pidfile = config.get("*", "core", "pidfile"); + local pidfile = config_get("*", "core", "pidfile"); if pidfile then local pf, err = io.open(pidfile, "w+"); if not pf then - log("error", "Couldn't write pidfile; %s", err); + module:log("error", "Couldn't write pidfile; %s", err); else pf:write(tostring(pposix.getpid())); pf:close(); @@ -61,11 +61,11 @@ if not config_get("*", "core", "no_daemonize") then local function daemonize_server() local ok, ret = pposix.daemonize(); if not ok then - log("error", "Failed to daemonize: %s", ret); + module:log("error", "Failed to daemonize: %s", ret); elseif ret and ret > 0 then os.exit(0); else - log("info", "Successfully daemonized to PID %d", pposix.getpid()); + module:log("info", "Successfully daemonized to PID %d", pposix.getpid()); write_pidfile(); end end @@ -80,13 +80,13 @@ module:add_event_hook("server-stopped", remove_pidfile); -- Set signal handler if signal.signal then signal.signal("SIGTERM", function () - log("warn", "Received SIGTERM..."); - unlock_globals(); - if prosody_shutdown then - prosody_shutdown("Received SIGTERM"); + module:log("warn", "Received SIGTERM..."); + _G.unlock_globals(); + if _G.prosody_shutdown then + _G.prosody_shutdown("Received SIGTERM"); else - log("warn", "...no prosody_shutdown(), ignoring."); + module:log("warn", "...no prosody_shutdown(), ignoring."); end - lock_globals(); + _G.lock_globals(); end); end |