From 762037c42d07436c0b72f02ea22b2795c54ea705 Mon Sep 17 00:00:00 2001 From: Kishi85 Date: Thu, 4 Apr 2019 12:44:38 +0200 Subject: [PATCH] standalone: cleanup start/stop challenge stop_challenge should only stop the server if the thread is still alive --- acertmgr/modes/standalone.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/acertmgr/modes/standalone.py b/acertmgr/modes/standalone.py index 5353548..464eaa7 100644 --- a/acertmgr/modes/standalone.py +++ b/acertmgr/modes/standalone.py @@ -67,13 +67,14 @@ class ChallengeHandler(HTTPChallengeHandler): del self.challenges[token] def start_challenge(self, domain, thumbprint, token): - def _(): + def _serve(): self.server.serve_forever() - self.server_thread = threading.Thread(target=_) + self.server_thread = threading.Thread(target=_serve) self.server_thread.start() HTTPChallengeHandler.start_challenge(self, domain, thumbprint, token) def stop_challenge(self, domain, thumbprint, token): - self.server.shutdown() - self.server_thread.join() + if self.server_thread.is_alive(): + self.server.shutdown() + self.server_thread.join()