X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_posix.lua;h=d229c1b8e35fd74f202b6e91e68c3c9318524ce1;hb=c43ea656e3ccdc159ba27904fe06a9226952e817;hp=9155289d82cc8b39cbf525a7032c1be8497ffa0c;hpb=134baf0ab61467d2b63673ef7505be84130d8357;p=prosody.git

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 9155289d..d229c1b8 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -7,7 +7,7 @@
 --
 
 
-local want_pposix_version = "0.3.1";
+local want_pposix_version = "0.3.5";
 
 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
@@ -17,8 +17,6 @@ if type(signal) == "string" then
 	module:log("warn", "Couldn't load signal library, won't respond to SIGTERM");
 end
 
-local logger_set = require "util.logger".setwriter;
-
 local lfs = require "lfs";
 local stat = lfs.attributes;
 
@@ -26,8 +24,11 @@ local prosody = _G.prosody;
 
 module.host = "*"; -- we're a global module
 
+local umask = module:get_option("umask") or "027";
+pposix.umask(umask);
+
 -- Allow switching away from root, some people like strange ports.
-module:add_event_hook("server-started", function ()
+module:hook("server-started", function ()
 		local uid = module:get_option("setuid");
 		local gid = module:get_option("setgid");
 		if gid then
@@ -51,16 +52,16 @@ module:add_event_hook("server-started", function ()
 	end);
 
 -- Don't even think about it!
-module:add_event_hook("server-starting", function ()
-		local suid = module:get_option("setuid");
-		if not suid or suid == 0 or suid == "root" then
-			if pposix.getuid() == 0 and not module:get_option("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");
-				prosody.shutdown("Refusing to run as root");
-			end
+if not prosody.start_time then -- server-starting
+	local suid = module:get_option("setuid");
+	if not suid or suid == 0 or suid == "root" then
+		if pposix.getuid() == 0 and not module:get_option("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");
+			prosody.shutdown("Refusing to run as root");
 		end
-	end);
+	end
+end
 
 local pidfile;
 local pidfile_handle;
@@ -92,14 +93,23 @@ local function write_pidfile()
 				pidfile_handle = nil;
 				prosody.shutdown("Prosody already running");
 			else
-				pidfile_handle:write(tostring(pposix.getpid()));
-				pidfile_handle:flush();
+				pidfile_handle:close();
+				pidfile_handle, err = io.open(pidfile, "w+");
+				if not pidfile_handle then
+					module:log("error", "Couldn't write pidfile at %s; %s", pidfile, err);
+					prosody.shutdown("Couldn't write pidfile");
+				else
+					if lfs.lock(pidfile_handle, "w") then
+						pidfile_handle:write(tostring(pposix.getpid()));
+						pidfile_handle:flush();
+					end
+				end
 			end
 		end
 	end
 end
 
-local syslog_opened 
+local syslog_opened;
 function syslog_sink_maker(config)
 	if not syslog_opened then
 		pposix.syslog_open("prosody");
@@ -107,12 +117,12 @@ function syslog_sink_maker(config)
 	end
 	local syslog, format = pposix.syslog_log, string.format;
 	return function (name, level, message, ...)
-			if ... then
-				syslog(level, format(message, ...));
-			else
-				syslog(level, message);
-			end
-		end;
+		if ... then
+			syslog(level, format(message, ...));
+		else
+			syslog(level, message);
+		end
+	end;
 end
 require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
 
@@ -138,13 +148,15 @@ if daemonize then
 			write_pidfile();
 		end
 	end
-	module:add_event_hook("server-starting", daemonize_server);
+	if not prosody.start_time then -- server-starting
+		daemonize_server();
+	end
 else
 	-- Not going to daemonize, so write the pid of this process
 	write_pidfile();
 end
 
-module:add_event_hook("server-stopped", remove_pidfile);
+module:hook("server-stopped", remove_pidfile);
 
 -- Set signal handlers
 if signal.signal then
@@ -160,4 +172,11 @@ if signal.signal then
 		prosody.reload_config();
 		prosody.reopen_logfiles();
 	end);
+	
+	signal.signal("SIGINT", function ()
+		module:log("info", "Received SIGINT");
+		prosody.unlock_globals();
+		prosody.shutdown("Received SIGINT");
+		prosody.lock_globals();
+	end);
 end