From 853f1d7f51b3fd6aec2637688798299d4b0d6a85 Mon Sep 17 00:00:00 2001 From: calvin Date: Sun, 14 May 2006 08:41:52 +0000 Subject: [PATCH] always disable status thread after checking, and log end of output git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3165 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/director/__init__.py | 4 ++-- linkcheck/director/aggregator.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/linkcheck/director/__init__.py b/linkcheck/director/__init__.py index 1c33fa22..68325395 100644 --- a/linkcheck/director/__init__.py +++ b/linkcheck/director/__init__.py @@ -39,8 +39,6 @@ def check_urls (aggregate): aggregate.start_threads() # blocks until all urls are checked aggregate.urlqueue.join() - status.disable_status() - aggregate.logger.end_log_output() except (KeyboardInterrupt, SystemExit): linkcheck.log.warn(linkcheck.LOG_CHECK, "keyboard interrupt; waiting for active threads to finish") @@ -48,6 +46,8 @@ def check_urls (aggregate): except: status.internal_error() aggregate.abort() + status.disable_status() + aggregate.logger.end_log_output() def get_aggregate (config): diff --git a/linkcheck/director/aggregator.py b/linkcheck/director/aggregator.py index d7b86dc5..754c9dc3 100644 --- a/linkcheck/director/aggregator.py +++ b/linkcheck/director/aggregator.py @@ -76,12 +76,13 @@ class Aggregate (object): def status (self): start_time = time.time() - while status.status_is_active(): + while True: time.sleep(5) + if not status.status_is_active(): + break status.print_status(self.urlqueue, start_time) def abort (self): self.urlqueue.do_shutdown() self.urlqueue.join(timeout=10) - self.logger.end_log_output()