portal 3.1.8__tar.gz → 3.1.10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.8
+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.8 → portal-3.1.10}/portal/__init__.py

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

{portal-3.1.8 → portal-3.1.10}/portal/contextlib.py

@@ -60,6 +60,7 @@ class Context:
         errfile = pathlib.Path(errfile)
       assert hasattr(errfile, 'exists') and hasattr(errfile, 'write_text')
       self.errfile = errfile
+      self._check_errfile()
 
     if interval:
       assert isinstance(interval, (int, float))
@@ -144,14 +145,14 @@ class Context:
     return self.children[ident]
 
   def _watcher(self):
-    while True:
-      if self.errfile and self.errfile.exists():
-        message = f'Shutting down due to error file: {self.errfile}',
-        print(message, file=sys.stderr)
-        self.shutdown(2)
-        break
-      if self.done.wait(self.interval):
-        break
+    while not self.done.wait(self.interval):
+      self._check_errfile()
+
+  def _check_errfile(self):
+    if self.errfile and self.errfile.exists():
+      message = f'Shutting down due to error file: {self.errfile}'
+      print(message, file=sys.stderr)
+      self.shutdown(exitcode=2)
 
 
 context = Context()

{portal-3.1.8 → 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.8 → portal-3.1.10/portal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: portal
-Version: 3.1.8
+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.8 → 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)

{portal-3.1.8 → portal-3.1.10}/tests/test_errfile.py

@@ -24,31 +24,30 @@ class TestErrfile:
     assert 'line' in content
     assert 'in fn' in content
 
-  @pytest.mark.parametrize('repeat', range(3))
+  @pytest.mark.parametrize('repeat', range(5))
   def test_sibling_procs(self, tmpdir, repeat):
     errfile = pathlib.Path(tmpdir) / 'error'
-    ready = portal.context.mp.Semaphore(0)
+    barrier = portal.context.mp.Barrier(3)
 
-    def fn1(ready, errfile):
+    def fn1(barrier, errfile):
       portal.setup(errfile=errfile, interval=0.1)
-      ready.release()
+      barrier.wait()
       raise ValueError('reason')
 
-    def fn2(ready, errfile):
+    def fn2(barrier, errfile):
       portal.setup(errfile=errfile, interval=0.1)
-      ready.release()
+      barrier.wait()
       while True:
         time.sleep(0.1)
 
-    worker1 = portal.Process(fn1, ready, errfile, name='worker1', start=True)
-    worker2 = portal.Process(fn2, ready, errfile, name='worker2', start=True)
-    ready.acquire()
-    ready.acquire()
+    worker1 = portal.Process(fn1, barrier, errfile, start=True)
+    worker2 = portal.Process(fn2, barrier, errfile, start=True)
+    barrier.wait()
     worker1.join()
     worker2.join()
     content = errfile.read_text()
     first_line = content.split('\n')[0]
-    assert "Error in 'worker1' (ValueError: reason):" == first_line
+    assert "Error in 'fn1' (ValueError: reason):" == first_line
     assert not worker1.running
     assert not worker2.running
     assert worker1.exitcode == 1