# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1674398624 -3600
# Node ID 9f96333640441b1479eca152f11a7c3fc70d6053
# Parent  57e86d537ffe7185fc71d4c678881be132816529# Parent  891edd1ebde6cea8951a86248010a7d5ed191c77
Merge 0.12->trunk

diff -r 57e86d537ffe -r 9f9633364044 prosodyctl
--- a/prosodyctl	Sat Jan 21 17:24:45 2023 +0100
+++ b/prosodyctl	Sun Jan 22 15:43:44 2023 +0100
@@ -670,11 +670,11 @@
 		local ok, ret = modulemanager.call_module_method(module, "command", arg);
 		if ok then
 			if type(ret) == "number" then
-				os.exit(ret);
+				os.exit(ret, true);
 			elseif type(ret) == "string" then
 				show_message(ret);
 			end
-			os.exit(0); -- :)
+			os.exit(0, true); -- :)
 		else
 			show_message("Failed to execute command: "..error_messages[ret]);
 			os.exit(1); -- :(
@@ -752,10 +752,10 @@
 		end
 
 
-		os.exit(0);
+		os.exit(0, true);
 	end
 
-	os.exit(commands[command](arg));
+	os.exit(commands[command](arg), true);
 end, watchers);
 
 command_runner:run(true);
diff -r 57e86d537ffe -r 9f9633364044 util/prosodyctl/shell.lua
--- a/util/prosodyctl/shell.lua	Sat Jan 21 17:24:45 2023 +0100
+++ b/util/prosodyctl/shell.lua	Sun Jan 22 15:43:44 2023 +0100
@@ -41,7 +41,7 @@
 		if have_readline then
 			readline.save_history();
 		end
-		os.exit();
+		os.exit(0, true);
 	end
 	send_line(client, line);
 end
@@ -118,7 +118,7 @@
 
 	client.events.add_handler("disconnected", function ()
 		print("--- session closed ---");
-		os.exit();
+		os.exit(0, true);
 	end);
 
 	client.events.add_handler("received", function (stanza)
diff -r 57e86d537ffe -r 9f9633364044 util/startup.lua
--- a/util/startup.lua	Sat Jan 21 17:24:45 2023 +0100
+++ b/util/startup.lua	Sun Jan 22 15:43:44 2023 +0100
@@ -653,7 +653,7 @@
 end
 
 function startup.exit()
-	os.exit(prosody.shutdown_code);
+	os.exit(prosody.shutdown_code, true);
 end
 
 -- prosodyctl only