Compare commits

..

No commits in common. "41c92cc94b51b95d4acd17bb36c8c22d84cd6f6c" and "d19fe501883b78e3a86ff76ed14bc6e9ce357492" have entirely different histories.

1 changed files with 2 additions and 7 deletions

View File

@ -238,14 +238,9 @@ class ServerThread(threading.Thread):
if fd == self.server_socket.fileno(): if fd == self.server_socket.fileno():
# Ready to receive, read into buffer and handle full messages # Ready to receive, read into buffer and handle full messages
if event | select.POLLIN: if event | select.POLLIN:
try: data = self.server_socket.recv(1024)
data = self.server_socket.recv(1024)
except ConnectionResetError:
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Connection reset while reading'))
reconnecting = True
break
# No data to be read even as POLLIN triggered → connection has broken # Mo data to be read even as POLLIN triggered → connection has broken
# Log it and try reconnecting # Log it and try reconnecting
if data == b'': if data == b'':
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Empty read')) self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Empty read'))