Merge 0.12->trunk

3 files changed, 7 insertions, 7 deletions

diff --git a/prosodyctl b/prosodyctl
index cb55858a..337b3593 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -670,11 +670,11 @@ local command_runner = async.runner(function ()
 		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 @@ local command_runner = async.runner(function ()
 		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 --git a/util/prosodyctl/shell.lua b/util/prosodyctl/shell.lua
index 5f99bec1..61050e4d 100644
--- a/util/prosodyctl/shell.lua
+++ b/util/prosodyctl/shell.lua
@@ -41,7 +41,7 @@ local function repl(client)
 		if have_readline then
 			readline.save_history();
 		end
-		os.exit();
+		os.exit(0, true);
 	end
 	send_line(client, line);
 end
@@ -118,7 +118,7 @@ local function start(arg) --luacheck: ignore 212/arg
 
 	client.events.add_handler("disconnected", function ()
 		print("--- session closed ---");
-		os.exit();
+		os.exit(0, true);
 	end);
 
 	client.events.add_handler("received", function (stanza)
diff --git a/util/startup.lua b/util/startup.lua
index 68b74984..8be54884 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -653,7 +653,7 @@ function startup.shutdown()
 end
 
 function startup.exit()
-	os.exit(prosody.shutdown_code);
+	os.exit(prosody.shutdown_code, true);
 end
 
 -- prosodyctl only