pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve feedback from the ping plugin.

Browse source 
Always print the error-condition when the iq is of type error, also
include the error text if it is present, and set a 10s timeout before
giving up.
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-15 22:22:56 +01:00
parent 95b7be7479
commit cc4132e0b4
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
plugins/ping.py
View file

@ -64,12 +64,26 @@ class Plugin(BasePlugin):
start = time.time()
def callback(iq):
delay = time.time() - start
if iq['type'] == 'error' and iq['error']['condition'] in ('remote-server-timeout', 'remote-server-not-found'):
self.api.information('%s did not respond to ping' % jid, 'Info')
error = False
reply = ''
if iq['type'] == 'error':
error_condition = iq['error']['condition']
reply = error_condition
if error_condition in ('remote-server-timeout', 'remote-server-not-found'):
error = True
error_text = iq['error']['text']
if error_text:
reply = '%s: %s' % (error_condition, error_text)
if error:
message = '%s did not respond to ping: %s' % (jid, reply)
else:
self.api.information('%s responded to ping after %s s' % (jid, round(delay, 4)), 'Info')
reply = ' (%s)' % reply if reply else ''
message = '%s responded to ping after %ss%s' % (jid, round(delay, 4), reply)
self.api.information(message, 'Info')
def timeout(iq):
self.api.information('%s did not respond to ping after 10s: timeout' % jid, 'Info')
self.core.xmpp.plugin['xep_0199'].send_ping(jid=jid, callback=callback)
self.core.xmpp.plugin['xep_0199'].send_ping(jid=jid, callback=callback, timeout=10, timeout_callback=timeout)
def completion_muc_ping(self, the_input):
users = [user.nick for user in self.api.current_tab().users]