Merge remote-tracking branch 'o3-master/master'
This commit is contained in:
commit
5df1efffd2
|
@ -314,7 +314,7 @@ class ServerThread(threading.Thread):
|
||||||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.server, address))
|
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.server, address))
|
||||||
try:
|
try:
|
||||||
self.server_socket = socket.create_connection(address)
|
self.server_socket = socket.create_connection(address)
|
||||||
except (ConnectionRefusedError, socket.gaierror):
|
except (ConnectionRefusedError, socket.gaierror, TimeoutError):
|
||||||
# Tell controller we failed
|
# Tell controller we failed
|
||||||
self.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, "Can't connect to %s:%s" % address))
|
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.close()
|
||||||
self.server_socket = None
|
self.server_socket = None
|
||||||
|
|
||||||
except (BrokenPipeError, TimeoutError) as err:
|
except (BrokenPipeError, TimeoutError, ConnectionResetError) as err:
|
||||||
# Connection broke, log it and try to reconnect
|
# 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.logging_channel.send((logmessage_types.internal, internal_submessage_types.error, 'Broken socket/pipe or timeout'))
|
||||||
self.server_socket.close()
|
self.server_socket.close()
|
||||||
|
|
Loading…
Reference in New Issue