Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

browser: fix duplicate logs when fetching loglevel #309

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions my/browser/active_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]:
Expand Down
8 changes: 2 additions & 6 deletions my/browser/common.py
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion my/browser/export.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class config(user_config.export):


logger = LazyLogger(__name__, level="warning")
_patch_browserexport_logs(__name__)
_patch_browserexport_logs(logger.level)


# all of my backed up databases
Expand Down