From 479713e25ba71f92ef8f287d7de6d604bd537434 Mon Sep 17 00:00:00 2001 From: Noah Levitt Date: Wed, 29 Jun 2016 18:29:45 -0500 Subject: [PATCH] --trace level logging --- brozzler/__init__.py | 3 +++ brozzler/browser.py | 2 +- brozzler/cli.py | 3 +++ brozzler/worker.py | 5 +++-- setup.py | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/brozzler/__init__.py b/brozzler/__init__.py index b0890e0..22a4a6e 100644 --- a/brozzler/__init__.py +++ b/brozzler/__init__.py @@ -64,6 +64,9 @@ class BaseDictable: def __repr__(self): return "{}(**{})".format(self.__class__.__name__, self.to_dict()) +# logging level more fine-grained than logging.DEBUG==10 +TRACE = 5 + from brozzler.site import Page, Site from brozzler.worker import BrozzlerWorker from brozzler.robots import is_permitted_by_robots diff --git a/brozzler/browser.py b/brozzler/browser.py index 02b7f3c..8e6481d 100644 --- a/brozzler/browser.py +++ b/brozzler/browser.py @@ -464,7 +464,7 @@ class Chrome: # returns websocket url to chrome window with about:blank loaded def start(self): - timeout_sec = 600 + timeout_sec = 20 new_env = os.environ.copy() new_env["HOME"] = self.user_home_dir chrome_args = [ diff --git a/brozzler/cli.py b/brozzler/cli.py index 86d1a65..9d4cca4 100644 --- a/brozzler/cli.py +++ b/brozzler/cli.py @@ -41,6 +41,9 @@ def _add_common_options(arg_parser): arg_parser.add_argument( '-v', '--verbose', dest='log_level', action='store_const', default=logging.INFO, const=logging.DEBUG) + arg_parser.add_argument( + '--trace', dest='log_level', + action='store_const', default=logging.INFO, const=brozzler.TRACE) arg_parser.add_argument( '--version', action='version', version='brozzler %s - %s' % ( diff --git a/brozzler/worker.py b/brozzler/worker.py index dc1fc7b..74701d2 100644 --- a/brozzler/worker.py +++ b/brozzler/worker.py @@ -326,8 +326,9 @@ class BrozzlerWorker: try: self.status_info = self._service_registry.heartbeat(status_info) - self.logger.debug( - "status in service registry: %s", self.status_info) + self.logger.log( + brozzler.TRACE, "status in service registry: %s", + self.status_info) except rethinkdb.ReqlError as e: self.logger.error( "failed to send heartbeat and update service registry " diff --git a/setup.py b/setup.py index dc2ac7d..455bd65 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ import setuptools setuptools.setup( name='brozzler', - version='1.1.dev31', + version='1.1.dev32', description='Distributed web crawling with browsers', url='https://github.com/internetarchive/brozzler', author='Noah Levitt',