aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-09-29 18:44:58 +0200
committerKim Alvefur <zash@zash.se>2019-09-29 18:44:58 +0200
commitf304a306dd05b8f99ba5ef26d301ea33731d2007 (patch)
tree09e99d4a6b85471cc5dd5b64e63bfaca24e82bf1
parent6b4ed1a30aa2a8b7e07ba7397564f41af53565ba (diff)
downloadprosody-f304a306dd05b8f99ba5ef26d301ea33731d2007.tar.gz
prosody-f304a306dd05b8f99ba5ef26d301ea33731d2007.zip
mod_admin_telnet: Use new compact function for waiting on promises
-rw-r--r--plugins/mod_admin_telnet.lua8
1 files changed, 1 insertions, 7 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 5c08b8d1..24230257 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -1148,13 +1148,7 @@ function def_env.xmpp:ping(localhost, remotehost, timeout)
end
local iq = st.iq{ from=localhost, to=remotehost, type="get", id=new_id()}
:tag("ping", {xmlns="urn:xmpp:ping"});
- local ret, err;
- local wait, done = async.waiter();
- module:context(localhost):send_iq(iq, nil, timeout)
- :next(function (ret_) ret = ret_; end,
- function (err_) err = err_; end)
- :finally(done);
- wait();
+ local ret, err = async.wait(module:context(localhost):send_iq(iq, nil, timeout));
if ret then
return true, "pong from " .. ret.stanza.attr.from;
else