Skip to content

Commit 40ee833

Browse files
committed
fix
1 parent 6e2a7c1 commit 40ee833

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

services/web/server/src/simcore_service_webserver/cli.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
1414
"""
1515

16-
from contextlib import AsyncExitStack
1716
import logging
1817
import os
18+
from contextlib import AsyncExitStack
1919
from typing import Annotated, Final
2020

2121
import typer
2222
from aiohttp import web
2323
from common_library.json_serialization import json_dumps
24-
from settings_library.utils_cli import create_settings_command
25-
2624
from servicelib.logging_utils import setup_async_loggers
25+
from settings_library.utils_cli import create_settings_command
2726

2827
from .application_settings import ApplicationSettings
2928
from .login import cli as login_cli
@@ -78,9 +77,6 @@ async def app_factory() -> web.Application:
7877
setup_logging(
7978
level=app_settings.log_level,
8079
slow_duration=app_settings.AIODEBUG_SLOW_DURATION_SECS,
81-
log_format_local_dev_enabled=app_settings.WEBSERVER_LOG_FORMAT_LOCAL_DEV_ENABLED,
82-
logger_filter_mapping=app_settings.WEBSERVER_LOG_FILTER_MAPPING,
83-
tracing_settings=app_settings.WEBSERVER_TRACING,
8480
)
8581

8682
exit_stack = AsyncExitStack()

services/web/server/src/simcore_service_webserver/log.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from aiodebug import log_slow_callbacks # type: ignore[import-untyped]
66
from aiohttp.log import access_logger
7-
from settings_library.tracing import TracingSettings
87

98
LOG_LEVEL_STEP = logging.CRITICAL - logging.ERROR
109
NOISY_LOGGERS = (
@@ -22,14 +21,7 @@
2221
)
2322

2423

25-
def setup_logging(
26-
*,
27-
level: str | int,
28-
slow_duration: float | None = None,
29-
log_format_local_dev_enabled: bool,
30-
logger_filter_mapping: dict,
31-
tracing_settings: TracingSettings | None,
32-
):
24+
def setup_logging(*, level: str | int, slow_duration: float | None = None):
3325
# service log level
3426
logging.basicConfig(level=level)
3527

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/conftest.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,7 @@ def app_environment(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatc
5151
)
5252

5353
# NOTE: To see logs, use pytest -s --log-cli-level=DEBUG
54-
setup_logging(
55-
level=logging.DEBUG,
56-
log_format_local_dev_enabled=True,
57-
logger_filter_mapping={},
58-
tracing_settings=None,
59-
)
54+
setup_logging(level=logging.DEBUG)
6055

6156
plugin_settings = StudiesDispatcherSettings.create_from_envs()
6257
print(plugin_settings.model_dump_json(indent=1))

0 commit comments

Comments
 (0)