Yann Leboulanger pushed to branch master at gajim / python-nbxmpp
Commits:
650450d4 by Yann Leboulanger at 2017-12-22T12:45:47+01:00
prevent TB loop and 100% CPU on connection cut
- - - - -
1 changed file:
- nbxmpp/transports_nb.py
Changes:
=====================================
nbxmpp/transports_nb.py
=====================================
--- a/nbxmpp/transports_nb.py
+++ b/nbxmpp/transports_nb.py
@@ -609,13 +609,13 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
try:
# get as many bites, as possible, but not more than RECV_BUFSIZE
received = self._recv(RECV_BUFSIZE)
- except socket.error as e:
- log.info("_do_receive: got %s:" % received, exc_info=True)
except tls_nb.SSLWrapper.Error as e:
log.info("_do_receive, caught SSL error, got %s:" % received,
exc_info=True)
errnum, errstr = e.errno,\
decode_py2(e.strerror, locale.getpreferredencoding())
+ except socket.error as e:
+ log.info("_do_receive: got %s:" % received, exc_info=True)
if received == '':
errstr = 'zero bytes on recv'
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/commit/650450d448f2828af3717bc544caf632e031837b
---
View it on GitLab:
https://dev.gajim.org/gajim/python-nbxmpp/commit/650450d448f2828af3717bc544caf632e031837b
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
