From 11495c582022558845446dcd89abf404bd3367bb Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Tue, 20 Oct 2015 20:16:12 +0000 Subject: [PATCH] Better logging for start/stop acme.standalone servers. --- acme/acme/standalone.py | 1 + letsencrypt/plugins/standalone.py | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/acme/acme/standalone.py b/acme/acme/standalone.py index 97e52fa9f..b0d8f08bd 100644 --- a/acme/acme/standalone.py +++ b/acme/acme/standalone.py @@ -55,6 +55,7 @@ class ACMEServerMixin: # pylint: disable=old-style-class def serve_forever2(self): """Serve forever, until other thread calls `shutdown2`.""" + logger.debug("Starting server at %s:%d...", *self.socket.getsockname()) while not self._stopped: self.handle_request() diff --git a/letsencrypt/plugins/standalone.py b/letsencrypt/plugins/standalone.py index 3ad823e9c..d548b2162 100644 --- a/letsencrypt/plugins/standalone.py +++ b/letsencrypt/plugins/standalone.py @@ -72,13 +72,12 @@ class ServerManager(object): except socket.error as error: raise errors.StandaloneBindError(error, port) - # if port == 0, then random free port on OS is taken - # pylint: disable=no-member - host, real_port = server.socket.getsockname() thread = threading.Thread(target=server.serve_forever2) - logger.debug("Starting server at %s:%d", host, real_port) thread.start() + # if port == 0, then random free port on OS is taken + # pylint: disable=no-member + _, real_port = server.socket.getsockname() self._instances[real_port] = self._Instance(server, thread) return server @@ -89,6 +88,8 @@ class ServerManager(object): """ instance = self._instances[port] + logger.debug("Stopping server at %s:%d...", + *instance.server.socket.getsockname()) instance.server.shutdown2() instance.thread.join() del self._instances[port]