#15: time-outed connection is ok when cleaning DB session.

nogamespy/protocol.py

@@ -4,6 +4,8 @@
 import socketserver
 import struct
 
+from pymysql.err import OperationalError
+
 import aluigi
 from . import models, tasks, settings
 from .database import db_session
@@ -60,8 +62,12 @@ class MasterHandler(socketserver.BaseRequestHandler):
     def handle(self):
         logger.debug(f'Responding to {self.request.getpeername()[0]}...')
 
-        # so we're not stuck in a previous invalid transaction
-        db_session.remove()
+        try:
+            # so we're not stuck in a previous invalid transaction
+            db_session.remove()
+        except OperationalError:
+            # connection can be time-outed
+            pass
 
         self.request.sendall('\\basic\\\\secure\\'.encode('latin1'))
         self.request.send(get_encoded_server_list())
@@ -82,8 +88,12 @@ class HeartbeatHandler(socketserver.BaseRequestHandler):
     def handle(self):
         logger.debug(f'Got heartbeat from {self.client_address[0]}...')
 
-        # so we're not stuck in a previous invalid transaction
-        db_session.remove()
+        try:
+            # so we're not stuck in a previous invalid transaction
+            db_session.remove()
+        except OperationalError:
+            # connection can be time-outed
+            pass
 
         msg = self.request[0].decode('ascii').split('\\')