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.

1 files changed, 12 insertions, 2 deletions

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 23757761..7461f237 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -42,7 +42,6 @@ if not config_get("*", "core", "no_daemonize") then
 		if not ok then
 			log("error", "Failed to daemonize: %s", ret);
 		elseif ret and ret > 0 then
-			log("info", "Daemonized to pid %d", ret);			
 			os.exit(0);
 		else
 			if logwriter then
@@ -51,7 +50,18 @@ if not config_get("*", "core", "no_daemonize") then
 					log("error", "Couldn't set new log output: %s", ret);
 				end
 			end
-			log("info", "Successfully daemonized");	
+			log("info", "Successfully daemonized to PID %d", pposix.getpid());
+			
+			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);
+				else
+					pf:write(tostring(pposix.getpid()));
+					pf:close();
+				end
+			end
 		end
 	end
 	module:add_event_hook("server-starting", daemonize_server);