Diff

prosodyctl @ 12864:9f9633364044

Merge 0.12->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 22 Jan 2023 15:43:44 +0100
parent 12589:39ae08180c81
parent 12863:891edd1ebde6
child 12954:4f2accd99373
line wrap: on
line diff
--- 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);