Surface actual listening port via flags.port

Author: abhinavsingh

proxy/core/acceptor/pool.py

@@ -111,9 +111,10 @@ def listen(self) -> None:
         self.socket.bind((str(self.flags.hostname), self.flags.port))
         self.socket.listen(self.flags.backlog)
         self.socket.setblocking(False)
-        logger.info(
-            'Listening on %s:%d' %
-            (self.flags.hostname, self.flags.port))
+        # Override flags.port to match the actual port
+        # we are listening upon.  This is necessary to preserve
+        # the server port when `--port=0` is used.
+        self.flags.port = self.socket.getsockname()[1]
 
     def start_workers(self) -> None:
         """Start worker processes."""

proxy/proxy.py

@@ -132,7 +132,7 @@ class Proxy:
 
     def __init__(self, input_args: Optional[List[str]], **opts: Any) -> None:
         self.flags = Proxy.initialize(input_args, **opts)
-        self.acceptors: Optional[AcceptorPool] = None
+        self.pool: Optional[AcceptorPool] = None
         # TODO(abhinavsingh): Allow users to override the worker class itself
         # e.g. A clear text protocol. Or imagine a TelnetProtocolHandler instead
         # of default HttpProtocolHandler.
@@ -150,11 +150,11 @@ def delete_pid_file(self) -> None:
             os.remove(self.flags.pid_file)
 
     def __enter__(self) -> 'Proxy':
-        self.acceptors = AcceptorPool(
+        self.pool = AcceptorPool(
             flags=self.flags,
             work_klass=self.work_klass
         )
-        self.acceptors.setup()
+        self.pool.setup()
         self.write_pid_file()
         return self
 
@@ -163,8 +163,8 @@ def __exit__(
             exc_type: Optional[Type[BaseException]],
             exc_val: Optional[BaseException],
             exc_tb: Optional[TracebackType]) -> None:
-        assert self.acceptors
-        self.acceptors.shutdown()
+        assert self.pool
+        self.pool.shutdown()
         self.delete_pid_file()
 
     @staticmethod
@@ -449,7 +449,10 @@ def main(
         input_args: Optional[List[str]] = None,
         **opts: Any) -> None:
     try:
-        with Proxy(input_args=input_args, **opts):
+        with Proxy(input_args=input_args, **opts) as proxy:
+            assert proxy.pool is not None
+            logger.info('Listening on %s:%d' %
+                        (proxy.pool.flags.hostname, proxy.pool.flags.port))
             # TODO: Introduce cron feature
             # https://github.com/abhinavsingh/proxy.py/issues/392
             while True:

tests/core/test_acceptor_pool.py

@@ -49,7 +49,7 @@ def test_setup_and_shutdown(
         sock.setsockopt.assert_called_with(
             socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind.assert_called_with(
-            (str(pool.flags.hostname), pool.flags.port))
+            (str(pool.flags.hostname), 8899))
         sock.listen.assert_called_with(pool.flags.backlog)
         sock.setblocking.assert_called_with(False)