portal 3.1.10__tar.gz → 3.1.12__tar.gz

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

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

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

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

{portal-3.1.10 → portal-3.1.12}/portal/batching.py

@@ -19,6 +19,7 @@ class BatchServer:
       self, port, name='Server', workers=1, errors=True,
       process=True, shmem=False, **kwargs):
     inner_port = utils.free_port()
+    assert port != inner_port, (port, inner_port)
     self.name = name
     self.server = server.Server(inner_port, name, workers, errors, **kwargs)
     if process:

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

@@ -61,6 +61,7 @@ class Context:
       assert hasattr(errfile, 'exists') and hasattr(errfile, 'write_text')
       self.errfile = errfile
       self._check_errfile()
+      self._install_excepthook()
 
     if interval:
       assert isinstance(interval, (int, float))
@@ -148,6 +149,16 @@ class Context:
     while not self.done.wait(self.interval):
       self._check_errfile()
 
+  def _install_excepthook(self):
+    existing = sys.excepthook
+    def patched(typ, val, tb):
+      if self.errfile:
+        message = ''.join(traceback.format_exception(typ, val, tb)).strip('\n')
+        self.errfile.write_text(message)
+        print(f'Wrote errorfile: {self.errfile}', file=sys.stderr)
+      return existing(typ, val, tb)
+    sys.excepthook = patched
+
   def _check_errfile(self):
     if self.errfile and self.errfile.exists():
       message = f'Shutting down due to error file: {self.errfile}'

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

@@ -48,6 +48,7 @@ class ServerSocket:
       self.addr = (self.options.host, port)
     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     # self.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+    self._log(f'Binding to {self.addr[0]}:{self.addr[1]}')
     self.sock.bind(self.addr)
     self.sock.setblocking(False)
     self.sock.listen()

{portal-3.1.10 → portal-3.1.12}/portal/utils.py

@@ -82,12 +82,12 @@ def free_port():
   # Return a port that is currently free. This function is not thread or
   # process safe, because there is no way to guarantee that the port will still
   # be free at the time it will be used.
-  rng = np.random.default_rng()
-  while True:
-    port = int(rng.integers(2000, 7000))
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-      if s.connect_ex(('', port)):
-        return port
+  sock = socket.socket()
+  sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+  sock.bind(('localhost', 0))
+  port = sock.getsockname()[1]
+  sock.close()
+  return port
 
 
 def style(color=None, background=None, bold=None, underline=None, reset=None):

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

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