diff options
| author | Kim Alvefur <zash@zash.se> | 2023-01-22 15:43:44 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2023-01-22 15:43:44 +0100 |
| commit | 9228a851bc4b93bf442a62b8b7392ee087374bea (patch) | |
| tree | f85923490900529d25cf8e3873091df374ee7cf4 /util | |
| parent | 27d63ff731ebeb2ada1fcc1d812c0fa637de35b3 (diff) | |
| parent | 435e008568a0590f89e3b6477b9d6ded3ac024b4 (diff) | |
| download | prosody-9228a851bc4b93bf442a62b8b7392ee087374bea.tar.gz prosody-9228a851bc4b93bf442a62b8b7392ee087374bea.zip | |
Merge 0.12->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/prosodyctl/shell.lua | 4 | ||||
| -rw-r--r-- | util/startup.lua | 2 |
2 files changed, 3 insertions, 3 deletions
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 |