prosody-hg: plugins/mod_posix.lua annotate

annotate plugins/mod_posix.lua @ 991:cd0d75de8345

mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM.

author	Matthew Wild <mwild1@gmail.com>
date	Sun, 12 Apr 2009 02:57:52 +0100
parents	d247d061409a
children	409f22d0430f

rev	line source
728 fa45dfb27ee5 mod_posix: Check version of pposix Matthew Wild <mwild1@gmail.com> parents: 723 diff changeset	1
734 cfb4ec5cba5e Fix for pposix version detection Matthew Wild <mwild1@gmail.com> parents: 728 diff changeset	2 local want_pposix_version = "0.3.0";
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	3
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 local pposix = assert(require "util.pposix");
735 d247d061409a mod_posix: logging fix Matthew Wild <mwild1@gmail.com> parents: 734 diff changeset	5 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
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	6
991 cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	7 local signal = select(2, pcall(require, "util.signal"));
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	8 if type(signal) == "string" then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	9 log("warn", "Couldn't load signal library, won't respond to SIGTERM");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	10 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	11
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	12 local config_get = require "core.configmanager".get;
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	13 local logger_set = require "util.logger".setwriter;
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	14
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	15 module.host = "*"; -- we're a global module
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	16
991 cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	17 local function write_pidfile()
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	18 local pidfile = config.get("*", "core", "pidfile");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	19 if pidfile then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	20 local pf, err = io.open(pidfile, "w+");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	21 if not pf then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	22 log("error", "Couldn't write pidfile; %s", err);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	23 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	24 pf:write(tostring(pposix.getpid()));
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	25 pf:close();
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	26 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	27 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	28 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	29
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	30 local logfilename = config_get("*", "core", "log");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	31 if logfilename == "syslog" then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	32 pposix.syslog_open("prosody");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	33 pposix.syslog_setminlevel(config.get("*", "core", "minimum_log_level") or "info");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	34 local syslog, format = pposix.syslog_log, string.format;
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	35 logwriter = function (name, level, message, ...)
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	36 if ... then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	37 syslog(level, format(message, ...));
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	38 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	39 syslog(level, message);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	40 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	41 end;
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	42 elseif logfilename then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	43 local logfile = io.open(logfilename, "a+");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	44 if logfile then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	45 local write, format, flush = logfile.write, string.format, logfile.flush;
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	46 logwriter = function (name, level, message, ...)
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	47 if ... then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	48 write(logfile, name, "\t", level, "\t", format(message, ...), "\n");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	49 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	50 write(logfile, name, "\t" , level, "\t", message, "\n");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	51 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	52 flush(logfile);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	53 end;
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	54 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	55 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	56 log("debug", "No logging specified, will continue with default");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	57 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	58
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	59 if logwriter then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	60 local ok, ret = logger_set(logwriter);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	61 if not ok then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	62 log("error", "Couldn't set new log output: %s", ret);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	63 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	64 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	65
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	66 if not config_get("*", "core", "no_daemonize") then
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	67 local function daemonize_server()
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	68 local logwriter;
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	69
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	70
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	71 local ok, ret = pposix.daemonize();
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	72 if not ok then
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	73 log("error", "Failed to daemonize: %s", ret);
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	74 elseif ret and ret > 0 then
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	75 os.exit(0);
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	76 else
723 c1e7d280c174 mod_posix/pposix: Fix reporting of incorrect PID on daemonization. Log correct PID, and support writing a pidfile (pidfile = '/path/to/prosody.pid' in config). Added getpid() to pposix and improved function names. Matthew Wild <mwild1@gmail.com> parents: 722 diff changeset	77 log("info", "Successfully daemonized to PID %d", pposix.getpid());
991 cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	78 write_pidfile();
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 end
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	80 end
43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	81 module:add_event_hook("server-starting", daemonize_server);
991 cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	82 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	83 write_pidfile();
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	84 -- Not going to daemonize, but let's write the pidfile anyway
587 43f509a1519a Add mod_posix, fixes #5 Matthew Wild <mwild1@gmail.com> parents: diff changeset	85 end
991 cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	86
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	87 -- Set signal handler
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	88 if signal.signal then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	89 signal.signal("SIGTERM", function ()
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	90 log("warn", "Received SIGTERM...");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	91 unlock_globals();
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	92 if prosody_shutdown then
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	93 prosody_shutdown("Received SIGTERM");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	94 else
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	95 log("warn", "...no prosody_shutdown(), ignoring.");
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	96 end
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	97 lock_globals();
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	98 end);
cd0d75de8345 mod_posix: Allow logging and pidfile options to take effect without needing to daemonize. Add the ability to catch SIGTERM. Matthew Wild <mwild1@gmail.com> parents: 735 diff changeset	99 end

Mercurial > prosody-hg

annotate plugins/mod_posix.lua @ 991:cd0d75de8345