Monster whitespace commit (beware the whitespace monster).

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 52b1e0e6e510533ca87987ce01da71b0a1d02177..e86b785450f77152b9ac21959444aef78dbc4104 100644 (file)
--- 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
@@ -95,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");
@@ -110,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);
 
@@ -149,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