Software / code / prosody
Changeset
12864:9f9633364044
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 22 Jan 2023 15:43:44 +0100 |
| parents | 12861:57e86d537ffe (current diff) 12863:891edd1ebde6 (diff) |
| children | 12865:e6324117f124 |
| files | prosodyctl util/prosodyctl/shell.lua util/startup.lua |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
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);
--- 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)
