mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2023-01-22 15:43:44 +01:00
commit 9228a851bc
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
prosodyctl
View file

@ -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);

4
util/prosodyctl/shell.lua
View file

@ -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)

2
util/startup.lua
View file

@ -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