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 async waiting for last shutdown steps

Browse source 
Observed problem: When shutting down prosody would immediately exit
after waiting for s2s connections to close, skipping the last cleanup
events and reporting the exit reason and code.

This happens because prosody.main_thread is in a waiting state and
queuing startup.shutdown is dispatched trough the main loop via
nexttick, but since the main loop was no longer running at that point it
proceeded to the end of the prosody script and exited there.
This commit is contained in:
Kim Alvefur 2022-06-14 16:28:49 +02:00
parent bfe2a924f8
commit d5e749bc8a
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
prosody
View file

@ -82,4 +82,4 @@ end
loop();
thread:run(startup.shutdown);
startup.exit();

6
util/startup.lua
View file

@ -353,7 +353,7 @@ function startup.add_global_prosody_functions()
reason = reason;
code = code;
});
server.setquitting(true);
prosody.main_thread:run(startup.shutdown);
end
end
@ -644,6 +644,10 @@ function startup.shutdown()
prosody.log("debug", "Shutdown reason was: %s", prosody.shutdown_reason or "not specified");
prosody.log("debug", "Exiting with status code: %d", prosody.shutdown_code or 0);
server.setquitting(true);
end
function startup.exit()
os.exit(prosody.shutdown_code);
end