citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Less verbose connection error reporting 

- don't print tracebacks on normal (timeout/reset) errors
This commit is contained in:
Peter Šurda 2017-02-26 20:29:07 +01:00
parent cff1af1b4f
commit d8301ff512
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/class_sendDataThread.py
View File

@ -96,7 +96,8 @@ class sendDataThread(threading.Thread):
select.select([], [self.sslSock], [], 10) select.select([], [self.sslSock], [], 10)
logger.debug('sock.recv retriable SSL error') logger.debug('sock.recv retriable SSL error')
continue continue
raise logger.debug('Connection error (SSL)')
return False
except socket.error as e: except socket.error as e:
if e.errno in (errno.EAGAIN, errno.EWOULDBLOCK) or \ if e.errno in (errno.EAGAIN, errno.EWOULDBLOCK) or \
(sys.platform.startswith('win') and \ (sys.platform.startswith('win') and \
@ -104,8 +105,8 @@ class sendDataThread(threading.Thread):
select.select([], [self.sslSock if isSSL else self.sock], [], 10) select.select([], [self.sslSock if isSSL else self.sock], [], 10)
logger.debug('sock.recv retriable error') logger.debug('sock.recv retriable error')
continue continue
if e.errno == errno.EPIPE: if e.errno in (errno.EPIPE, errno.ECONNRESET):
logger.debug('Connection broken') logger.debug('Connection error (EPIPE/ECONNRESET)')
return False return False
raise raise
throttle.SendThrottle().wait(amountSent) throttle.SendThrottle().wait(amountSent)