aboutsummaryrefslogtreecommitdiffstats
path: root/util/startup.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2022-06-14 16:28:49 +0200
committerKim Alvefur <zash@zash.se>2022-06-14 16:28:49 +0200
commitd5e749bc8a1a6b003ba858310145745dcad5ec9c (patch)
tree886a16182bf8a44291d345fd52766e4eddc1907d /util/startup.lua
parentbfe2a924f83627053681668fb49f98520906c5bb (diff)
downloadprosody-d5e749bc8a1a6b003ba858310145745dcad5ec9c.tar.gz
prosody-d5e749bc8a1a6b003ba858310145745dcad5ec9c.zip
util.startup: Fix async waiting for last shutdown steps
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.
Diffstat (limited to 'util/startup.lua')
-rw-r--r--util/startup.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua
index ab8b61da..e2e7db09 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -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