From d6134d71a398df1318ef565a3f7ee0e2fe72738f Mon Sep 17 00:00:00 2001
From: jesopo
Date: Wed, 1 Nov 2017 13:56:44 +0000
Subject: Don't put non-kwargs after unpacked list, handle ConnectionResetError

---
 IRCServer.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'IRCServer.py')

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]:
-- 
cgit v1.3.1-10-gc9f91