From be81466871b33bcca6bf19476bb68d4e24711a26 Mon Sep 17 00:00:00 2001 From: Sean Breckenridge Date: Thu, 14 Sep 2023 17:39:21 -0700 Subject: [PATCH] browser: fix duplicate logs when fetching loglevel --- my/browser/active_browser.py | 6 ++++-- my/browser/common.py | 8 ++------ my/browser/export.py | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/my/browser/active_browser.py b/my/browser/active_browser.py index c25c64d..601182a 100644 --- a/my/browser/active_browser.py +++ b/my/browser/active_browser.py @@ -21,12 +21,14 @@ class config(user_config.active_browser): from pathlib import Path from typing import Sequence, Iterator -from my.core import get_files, Stats +from my.core import get_files, Stats, make_logger from browserexport.merge import read_visits, Visit from sqlite_backup import sqlite_backup +logger = make_logger(__name__) + from .common import _patch_browserexport_logs -_patch_browserexport_logs(__name__) +_patch_browserexport_logs(logger.level) def inputs() -> Sequence[Path]: diff --git a/my/browser/common.py b/my/browser/common.py index 2c85ced..058c134 100644 --- a/my/browser/common.py +++ b/my/browser/common.py @@ -1,12 +1,8 @@ -from my.core import make_logger from my.core.util import __NOT_HPI_MODULE__ -def _patch_browserexport_logs(module_name: str): - # get the logger for the module this is being called from - module_logger = make_logger(module_name) - +def _patch_browserexport_logs(level: int): # grab the computed level (respects LOGGING_LEVEL_ prefixes) and set it on the browserexport logger from browserexport.log import setup as setup_browserexport_logger - setup_browserexport_logger(module_logger.level) + setup_browserexport_logger(level) diff --git a/my/browser/export.py b/my/browser/export.py index e9d6252..46a4217 100644 --- a/my/browser/export.py +++ b/my/browser/export.py @@ -26,7 +26,7 @@ from .common import _patch_browserexport_logs logger = LazyLogger(__name__, level="warning") -_patch_browserexport_logs(__name__) +_patch_browserexport_logs(logger.level) # all of my backed up databases