Merge 0.12->trunk

2 files changed, 6 insertions, 2 deletions

diff --git a/prosody b/prosody
index 914396c2..ac623cef 100755
--- a/prosody
+++ b/prosody
@@ -82,4 +82,4 @@ end
 
 loop();
 
-thread:run(startup.shutdown);
+startup.exit();
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