Compare commits
No commits in common. "5df1efffd252a6bfd287b219e8ac62dc7fa31f6a" and "41c92cc94b51b95d4acd17bb36c8c22d84cd6f6c" have entirely different histories.
5df1efffd2
...
41c92cc94b
|
@ -314,7 +314,7 @@ class ServerThread(threading.Thread):
|
|||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.server, address))
|
||||
try:
|
||||
self.server_socket = socket.create_connection(address)
|
||||
except (ConnectionRefusedError, socket.gaierror, TimeoutError):
|
||||
except (ConnectionRefusedError, socket.gaierror):
|
||||
# Tell controller we failed
|
||||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, "Can't connect to %s:%s" % address))
|
||||
|
||||
|
@ -391,7 +391,7 @@ class ServerThread(threading.Thread):
|
|||
self.server_socket.close()
|
||||
self.server_socket = None
|
||||
|
||||
except (BrokenPipeError, TimeoutError, ConnectionResetError) as err:
|
||||
except (BrokenPipeError, TimeoutError) as err:
|
||||
# Connection broke, log it and try to reconnect
|
||||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Broken socket/pipe or timeout'))
|
||||
self.server_socket.close()
|
||||
|
|
Loading…
Reference in New Issue