X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_posix.lua;h=e86b785450f77152b9ac21959444aef78dbc4104;hb=c72eea870ae98d356e03636a40f6cff16c2f6da1;hp=5e9d25442aebb4012ea9b20a180546382185ed0f;hpb=dc3a597efec96d5b2d236e8725fbc635b54989e9;p=prosody.git

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 5e9d2544..e86b7854 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -7,7 +7,7 @@
 --
 
 
-local want_pposix_version = "0.3.3";
+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
@@ -30,7 +30,7 @@ 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
@@ -82,6 +82,7 @@ local function write_pidfile()
 	end
 	pidfile = module:get_option("pidfile");
 	if pidfile then
+		local err;
 		local mode = stat(pidfile) and "r+" or "w+";
 		pidfile_handle, err = io.open(pidfile, mode);
 		if not pidfile_handle then
@@ -94,14 +95,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");
@@ -109,12 +119,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);
 
@@ -148,7 +158,7 @@ else
 	write_pidfile();
 end
 
-module:add_event_hook("server-stopped", remove_pidfile);
+module:hook("server-stopped", remove_pidfile);
 
 -- Set signal handlers
 if signal.signal then