Skip to content

Commit 900a236

Browse files
committed
Added loguru and updated files to use it when logging
1 parent 99a8d6a commit 900a236

6 files changed

Lines changed: 137 additions & 87 deletions

File tree

diff_poetry_lock/github.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import logging
2-
31
import requests
2+
from loguru import logger
43
from pydantic import BaseModel, Field, parse_obj_as
54
from requests import Response
65

@@ -9,8 +8,6 @@
98
MAGIC_COMMENT_IDENTIFIER = "<!-- posted by Github Action nborrmann/diff-poetry-lock -->\n\n"
109
MAGIC_BOT_USER_ID = 41898282
1110

12-
logger = logging.getLogger(__name__)
13-
1411

1512
class GithubComment(BaseModel):
1613
class GithubUser(BaseModel):

diff_poetry_lock/logging_utils.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import logging
21
import os
32
from enum import Enum
43
from typing import Final
54

5+
from loguru import logger
6+
67
DEBUG_ENV_VAR = "DEBUG_MODE"
78

89

@@ -16,12 +17,20 @@ class _StateKey(Enum):
1617

1718

1819
def configure_logging() -> None:
19-
"""Configure root logging once, honoring the debug flag env var."""
20-
if _STATE[_StateKey.CONFIGURED.value] or logging.getLogger().handlers:
20+
"""Configure logging once, honoring the debug flag env var."""
21+
if _STATE[_StateKey.CONFIGURED.value]:
2122
return
2223

23-
level = logging.DEBUG if _is_debug_enabled() else logging.INFO
24-
logging.basicConfig(level=level, format="%(levelname)s %(name)s - %(funcName)s: %(message)s")
24+
# Remove default handler
25+
logger.remove()
26+
27+
level = "DEBUG" if _is_debug_enabled() else "INFO"
28+
logger.add(
29+
lambda msg: print(msg, end=""),
30+
level=level,
31+
format="{level} {name} - {function}: {message}\n",
32+
colorize=False,
33+
)
2534
_STATE[_StateKey.CONFIGURED.value] = True
2635

2736

diff_poetry_lock/run_poetry.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
import logging
21
import tempfile
32
from operator import attrgetter
43
from pathlib import Path
54

65
import pydantic
6+
from loguru import logger
77
from poetry.core.packages.package import Package
88
from poetry.packages import Locker
99

1010
from diff_poetry_lock.github import GithubApi
1111
from diff_poetry_lock.logging_utils import configure_logging
1212
from diff_poetry_lock.settings import Settings, determine_and_load_settings
1313

14-
logger = logging.getLogger(__name__)
15-
1614

1715
def load_packages(filename: Path = Path("poetry.lock")) -> list[Package]:
1816
l_merged = Locker(Path(filename), local_config={})

diff_poetry_lock/settings.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import logging
21
import os
32
import sys
43
from abc import ABC
54
from typing import Any, ClassVar, Protocol, runtime_checkable
65

6+
from loguru import logger
77
from pydantic import BaseSettings, Field, PrivateAttr, ValidationError, validator
88

9-
logger = logging.getLogger(__name__)
10-
119

1210
class PrLookupService(Protocol):
1311
def find_pr_for_branch(self, branch_ref: str) -> str: ...

0 commit comments

Comments
 (0)