mirror of
https://github.com/certbot/certbot.git
synced 2026-01-21 19:01:07 +03:00
Better logging for start/stop acme.standalone servers.
This commit is contained in:
@@ -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()
|
||||
|
||||
|
||||
@@ -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]
|
||||
|
||||
Reference in New Issue
Block a user