portal 3.1.9__tar.gz → 3.1.10__tar.gz

{portal-3.1.9/portal.egg-info → portal-3.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.9
+Version: 3.1.10
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.9 → portal-3.1.10}/portal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.1.9'
+__version__ = '3.1.10'
 
 import multiprocessing as mp
 try:

{portal-3.1.9 → portal-3.1.10}/portal/server_socket.py

@@ -141,8 +141,11 @@ class ServerSocket:
       conn.recvbuf = buffers.RecvBuffer(maxsize=self.options.max_msg_size)
     try:
       conn.recvbuf.recv(conn.sock)
-    except ConnectionResetError:
-      self._disconnect(conn)
+    except OSError as e:
+      # For example:
+      # - ConnectionResetError
+      # - TimeoutError: [Errno 110] Connection timed out
+      self._disconnect(conn, e)
       return
     if conn.recvbuf.done():
       if self.recvq.qsize() > self.options.max_recv_queue:
@@ -150,8 +153,10 @@ class ServerSocket:
       self.recvq.put((conn.addr, conn.recvbuf.result()))
       conn.recvbuf = None
 
-  def _disconnect(self, conn):
-    self._log(f'Closed connection to {conn.addr[0]}:{conn.addr[1]}')
+  def _disconnect(self, conn, e):
+    detail = f'{type(e).__name__}'
+    detail = f'{detail}: {e}' if str(e) else detail
+    self._log(f'Closed connection to {conn.addr[0]}:{conn.addr[1]} ({detail})')
     conn = self.conns.pop(conn.addr)
     if conn.sendbufs:
       count = len(conn.sendbufs)

{portal-3.1.9 → portal-3.1.10/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.9
+Version: 3.1.10
 Summary: Fast and reliable distributed systems in Python
 Home-page: http://github.com/danijar/portal
 Author: Danijar Hafner

{portal-3.1.9 → portal-3.1.10}/tests/test_batching.py

@@ -110,7 +110,8 @@ class TestBatching:
     client.close()
     server.close()
 
-  def test_shape_mismatch(self):
+  @pytest.mark.parametrize('repeat', range(5))
+  def test_shape_mismatch(self, repeat):
     port = portal.free_port()
     server = portal.BatchServer(port, errors=False)
     server.bind('fn', lambda x: x, batch=2)