diff options
| author |  jesopo | 2017-11-01 13:56:44 +0000 |
|---|---|---|
| committer | jesopo | 2017-11-01 13:56:44 +0000 |
| commit | d6134d71a398df1318ef565a3f7ee0e2fe72738f (patch) | |
| tree | 4623e05036023d79f47b8b6c3dba3ab8b752ddbd /IRCServer.py | |
| parent | NR: Formatting improvements for external, don't reference non-existent summaries (diff) | |
Don't put non-kwargs after unpacked list, handle ConnectionResetError
Diffstat (limited to 'IRCServer.py')
| -rw-r--r-- | IRCServer.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/IRCServer.py b/IRCServer.py index 0de4d854..2c17ed11 100644 --- a/IRCServer.py +++ b/IRCServer.py @@ -154,7 +154,12 @@ class Server(object): "encoding", "utf8") fallback_encoding = self.bot.database.get_server_setting( self.id, "fallback-encoding", "latin-1") - data = self.read_buffer + self.socket.recv(4096) + data = b"" + try: + data = self.read_buffer + self.socket.recv(4096) + except ConnectionResetError: + self.disconnect() + return [] self.read_buffer = b"" data_lines = [line.strip(b"\r") for line in data.split(b"\n")] if data_lines[-1]: |