pass logger_name in remaining places

This commit is contained in:
Misty De Méo 2025-02-21 10:07:29 -08:00
parent b79054d27e
commit e1fccb261b
9 changed files with 12 additions and 10 deletions

View file

@ -123,7 +123,7 @@ def behavior_script(url, template_parameters=None, behaviors_dir=None):
""" """
import re, json import re, json
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
for behavior in behaviors(behaviors_dir=behaviors_dir): for behavior in behaviors(behaviors_dir=behaviors_dir):
if re.match(behavior["url_regex"], url): if re.match(behavior["url_regex"], url):

View file

@ -43,7 +43,7 @@ import rethinkdb as rdb
r = rdb.RethinkDB() r = rdb.RethinkDB()
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
def add_common_options(arg_parser, argv=None): def add_common_options(arg_parser, argv=None):

View file

@ -20,7 +20,7 @@ limitations under the License.
import structlog import structlog
import sys import sys
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
try: try:
import flask import flask

View file

@ -21,6 +21,8 @@ limitations under the License.
import structlog import structlog
import sys import sys
logger = structlog.get_logger(logger_name=__name__)
try: try:
import warcprox import warcprox
import warcprox.main import warcprox.main
@ -30,7 +32,7 @@ try:
import wsgiref.handlers import wsgiref.handlers
import brozzler.dashboard import brozzler.dashboard
except ImportError as e: except ImportError as e:
structlog.get_logger().critical( logger.critical(
'%s: %s\n\nYou might need to run "pip install ' '%s: %s\n\nYou might need to run "pip install '
'brozzler[easy]".\nSee README.rst for more information.', 'brozzler[easy]".\nSee README.rst for more information.',
type(e).__name__, type(e).__name__,
@ -310,7 +312,7 @@ class BrozzlerEasyController:
state_strs.append(str(th)) state_strs.append(str(th))
stack = traceback.format_stack(sys._current_frames()[th.ident]) stack = traceback.format_stack(sys._current_frames()[th.ident])
state_strs.append("".join(stack)) state_strs.append("".join(stack))
structlog.get_logger().warning( logger.warning(
"dumping state (caught signal)", signal=signum, state="\n".join(state_strs) "dumping state (caught signal)", signal=signum, state="\n".join(state_strs)
) )

View file

@ -36,7 +36,7 @@ import yaml
import zlib import zlib
from typing import Optional from typing import Optional
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
def load_schema(): def load_schema():

View file

@ -21,7 +21,7 @@ limitations under the License.
import sys import sys
import structlog import structlog
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
try: try:
import pywb.apps.cli import pywb.apps.cli

View file

@ -119,7 +119,7 @@ def is_permitted_by_robots(site, url, proxy=None):
# reppy has wrapped an exception that we want to bubble up # reppy has wrapped an exception that we want to bubble up
raise brozzler.ProxyError(e) raise brozzler.ProxyError(e)
else: else:
structlog.get_logger().warning( structlog.get_logger(logger_name=__name__).warning(
"returning true (permitted) after problem fetching " "robots.txt", "returning true (permitted) after problem fetching " "robots.txt",
url=url, url=url,
exception=e, exception=e,

View file

@ -40,7 +40,7 @@ YTDLP_WAIT = 10
YTDLP_MAX_REDIRECTS = 5 YTDLP_MAX_REDIRECTS = 5
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
def should_ytdlp(site, page, page_status, skip_av_seeds): def should_ytdlp(site, page, page_status, skip_av_seeds):

View file

@ -36,7 +36,7 @@ import sys
import warcprox import warcprox
logger = structlog.get_logger() logger = structlog.get_logger(logger_name=__name__)
# https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib # https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib