mod_tls: Update for new server SSL syntax

[prosody.git] / plugins / mod_posix.lua

diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 8c2c7d7dd5ad44bfe29f6a2564271409584659c5..55d52ccda1e09419a2d92b88e391b421de463562 100644 (file)
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -7,7 +7,7 @@
 --
 
 
-local want_pposix_version = "0.3.2";
+local want_pposix_version = "0.3.3";
 
 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
@@ -19,6 +19,9 @@ end
 
 local logger_set = require "util.logger".setwriter;
 
+local lfs = require "lfs";
+local stat = lfs.attributes;
+
 local prosody = _G.prosody;
 
 module.host = "*"; -- we're a global module
@@ -62,28 +65,38 @@ module:add_event_hook("server-starting", function ()
                end
        end);
 
-local pidfile_written;
+local pidfile;
+local pidfile_handle;
 
 local function remove_pidfile()
-       if pidfile_written then
-               os.remove(pidfile_written);
-               pidfile_written = nil;
+       if pidfile_handle then
+               pidfile_handle:close();
+               os.remove(pidfile);
+               pidfile, pidfile_handle = nil, nil;
        end
 end
 
 local function write_pidfile()
-       if pidfile_written then
+       if pidfile_handle then
                remove_pidfile();
        end
-       local pidfile = module:get_option("pidfile");
+       pidfile = module:get_option("pidfile");
        if pidfile then
-               local pf, err = io.open(pidfile, "w+");
-               if not pf then
-                       module:log("error", "Couldn't write pidfile; %s", err);
+               local mode = stat(pidfile) and "r+" or "w+";
+               pidfile_handle, err = io.open(pidfile, mode);
+               if not pidfile_handle then
+                       module:log("error", "Couldn't write pidfile at %s; %s", pidfile, err);
+                       prosody.shutdown("Couldn't write pidfile");
                else
-                       pf:write(tostring(pposix.getpid()));
-                       pf:close();
-                       pidfile_written = pidfile;
+                       if not lfs.lock(pidfile_handle, "w") then -- Exclusive lock
+                               local other_pid = pidfile_handle:read("*a");
+                               module:log("error", "Another Prosody instance seems to be running with PID %s, quitting", other_pid);
+                               pidfile_handle = nil;
+                               prosody.shutdown("Prosody already running");
+                       else
+                               pidfile_handle:write(tostring(pposix.getpid()));
+                               pidfile_handle:flush();
+                       end
                end
        end
 end