nortti
/
oonbotti2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'o3-master/master'

This commit is contained in:
Juhani Krekelä 2024-02-12 20:50:40 +02:00
parent 41c92cc94b c6c8e02a3b
commit 5df1efffd2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ircbot.py
View File

@ -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):
except (ConnectionRefusedError, socket.gaierror, TimeoutError):
# 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) as err:
except (BrokenPipeError, TimeoutError, ConnectionResetError) 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()