Skip to content

Commit 1b24aea

Browse files
fix Graylog parsing issue
1 parent 1170896 commit 1b24aea

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

packages/service-library/src/servicelib/logging_utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ def format(self, record) -> str:
137137

138138
def _setup_logging_formatter(
139139
*,
140-
tracing_settings: TracingSettings | None,
141140
log_format_local_dev_enabled: bool,
142141
) -> logging.Formatter:
143142
fmt = _LOCAL_FORMATTING if log_format_local_dev_enabled else _DEFAULT_FORMATTING
@@ -206,7 +205,6 @@ def _configure_common_logging_settings(
206205
setup_log_tracing(tracing_settings=tracing_settings)
207206

208207
return _setup_logging_formatter(
209-
tracing_settings=tracing_settings,
210208
log_format_local_dev_enabled=log_format_local_dev_enabled,
211209
)
212210

packages/service-library/tests/test_logging_utils.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# pylint:disable=redefined-outer-name
22
# pylint:disable=unused-argument
33

4+
import io
45
import logging
6+
import re
57
from collections.abc import Iterable
68
from contextlib import suppress
79
from pathlib import Path
@@ -10,6 +12,8 @@
1012
import pytest
1113
from faker import Faker
1214
from servicelib.logging_utils import (
15+
_DEFAULT_FORMATTING,
16+
CustomFormatter,
1317
LogExtra,
1418
LogLevelInt,
1519
LogMessageStr,
@@ -646,10 +650,6 @@ def test_grok_pattern_parsing(caplog: pytest.LogCaptureFixture) -> None:
646650
647651
WARNING: If log formatting changes, the Grok pattern in Graylog must be updated accordingly.
648652
"""
649-
import io
650-
import re
651-
652-
from servicelib.logging_utils import _DEFAULT_FORMATTING, CustomFormatter
653653

654654
# Create a custom handler with the default formatter
655655
log_stream = io.StringIO()
@@ -709,10 +709,6 @@ def test_grok_pattern_parsing_with_none_values(
709709
710710
WARNING: If log formatting changes, the Grok pattern in Graylog must be updated accordingly.
711711
"""
712-
import io
713-
import re
714-
715-
from servicelib.logging_utils import _DEFAULT_FORMATTING, CustomFormatter
716712

717713
# Create a custom handler with the default formatter
718714
handler = logging.StreamHandler(io.StringIO())

0 commit comments

Comments
 (0)