mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.startup: Fix exiting on pidfile trouble

Browse source 
prosody.shutdown() relies on prosody.main_thread, which has not been set
yet at this point.

Doing a clean shutdown might actually be harmful in case it tears down
things set up by the conflicting Prosody, such as the very pidfile we
were looking at.

Thanks again SigmaTel71 for noticing
This commit is contained in:
Kim Alvefur 2024-03-27 19:33:11 +01:00
parent a8556c1875
commit e311f13c43
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/startup.lua
View file

@ -719,20 +719,20 @@ function startup.write_pidfile()
local pidfile_handle, err = io.open(pidfile, mode);
if not pidfile_handle then
log("error", "Couldn't write pidfile at %s; %s", pidfile, err);
prosody.shutdown("Couldn't write pidfile", 1);
os.exit(1);
else
prosody.pidfile = pidfile;
if not lfs.lock(pidfile_handle, "w") then -- Exclusive lock
local other_pid = pidfile_handle:read("*a");
log("error", "Another Prosody instance seems to be running with PID %s, quitting", other_pid);
prosody.pidfile_handle = nil;
prosody.shutdown("Prosody already running", 1);
os.exit(1);
else
pidfile_handle:close();
pidfile_handle, err = io.open(pidfile, "w+");
if not pidfile_handle then
log("error", "Couldn't write pidfile at %s; %s", pidfile, err);
prosody.shutdown("Couldn't write pidfile", 1);
os.exit(1);
else
if lfs.lock(pidfile_handle, "w") then
pidfile_handle:write(tostring(pposix.getpid()));