upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Better logging for start/stop acme.standalone servers.

Browse source
This commit is contained in:
Jakub Warmuz 2015-10-20 20:16:12 +00:00
parent c83f11a3fd
commit 11495c5820
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acme/acme/standalone.py
View file

@ -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()

9
letsencrypt/plugins/standalone.py
View file

@ -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]