Merge remote-tracking branch 'o3-master/master'
This commit is contained in:
commit
41c92cc94b
|
@ -238,9 +238,14 @@ class ServerThread(threading.Thread):
|
|||
if fd == self.server_socket.fileno():
|
||||
# Ready to receive, read into buffer and handle full messages
|
||||
if event | select.POLLIN:
|
||||
data = self.server_socket.recv(1024)
|
||||
try:
|
||||
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
|
||||
|
||||
# Mo data to be read even as POLLIN triggered → connection has broken
|
||||
# No data to be read even as POLLIN triggered → connection has broken
|
||||
# Log it and try reconnecting
|
||||
if data == b'':
|
||||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Empty read'))
|
||||
|
|
Loading…
Reference in New Issue