diff --git a/brozzler/__init__.py b/brozzler/__init__.py index 35abfa3..7798e5f 100644 --- a/brozzler/__init__.py +++ b/brozzler/__init__.py @@ -180,7 +180,7 @@ class ThreadExceptionGate: "exception already pending for thread, discarding", pending_exception=self.pending_exception, thread=self.thread, - exception=e, + discarded_exception=e, ) else: self.pending_exception = e diff --git a/brozzler/browser.py b/brozzler/browser.py index f636662..00f05c9 100644 --- a/brozzler/browser.py +++ b/brozzler/browser.py @@ -293,7 +293,7 @@ class WebsockReceiverThread(threading.Thread): message["params"]["message"]["text"], ) elif message["method"] == "Runtime.exceptionThrown": - self.logger.debug("uncaught exception", exception=message) + self.logger.debug("uncaught exception", message=message) elif message["method"] == "Page.javascriptDialogOpening": self._javascript_dialog_opening(message) elif ( diff --git a/brozzler/cli.py b/brozzler/cli.py index c63d2b7..f31bc81 100755 --- a/brozzler/cli.py +++ b/brozzler/cli.py @@ -418,7 +418,7 @@ def brozzle_page(argv=None): on_screenshot=on_screenshot, enable_youtube_dl=not args.skip_youtube_dl, ) - logger.info("outlinks: \n\t%s", "\n\t".join(sorted(outlinks))) + logger.info("outlinks", outlinks=sorted(outlinks)) except brozzler.ReachedLimit as e: logger.exception("reached limit") except brozzler.PageInterstitialShown as e: diff --git a/brozzler/robots.py b/brozzler/robots.py index b3053b9..0c9d699 100644 --- a/brozzler/robots.py +++ b/brozzler/robots.py @@ -122,6 +122,6 @@ def is_permitted_by_robots(site, url, proxy=None): structlog.get_logger(logger_name=__name__).warning( "returning true (permitted) after problem fetching " "robots.txt", url=url, - exception=e, + raised_exception=e, ) return True diff --git a/tests/test_cluster.py b/tests/test_cluster.py index b891a0f..d3ece4b 100644 --- a/tests/test_cluster.py +++ b/tests/test_cluster.py @@ -73,11 +73,19 @@ def stop_service(service): def httpd(request): class RequestHandler(http.server.SimpleHTTPRequestHandler): def do_POST(self): - logger.info("\n%s\n%s", self.requestline, self.headers) + logger.info( + "RequestHandler.do_POST", + requestline=self.requestline, + headers=self.headers, + ) self.do_GET() def do_GET(self): - logger.info("\n%s\n%s", self.requestline, self.headers) + logger.info( + "RequestHandler.do_GET", + requestline=self.requestline, + headers=self.headers, + ) if self.path == "/site5/redirect/": self.send_response(303, "See other") self.send_header("Connection", "close")