Skip to content

Commit d510a99

Browse files
sandereggsanderegg
committed
rename
1 parent 5a8f89c commit d510a99

File tree

19 files changed

+49
-64
lines changed
  • packages/service-library/src/servicelib
  • services
    • agent/src/simcore_service_agent/core
    • api-server/src/simcore_service_api_server/core
    • autoscaling/src/simcore_service_autoscaling
    • catalog/src/simcore_service_catalog
    • clusters-keeper/src/simcore_service_clusters_keeper
    • dask-sidecar/src/simcore_service_dask_sidecar/utils
    • datcore-adapter/src/simcore_service_datcore_adapter
    • director-v2/src/simcore_service_director_v2/core
    • director/src/simcore_service_director
    • dynamic-scheduler/src/simcore_service_dynamic_scheduler
    • dynamic-sidecar/src/simcore_service_dynamic_sidecar/core
    • efs-guardian/src/simcore_service_efs_guardian
    • invitations/src/simcore_service_invitations
    • notifications/src/simcore_service_notifications/core
    • payments/src/simcore_service_payments
    • resource-usage-tracker/src/simcore_service_resource_usage_tracker
    • storage/src/simcore_service_storage

19 files changed

+49
-64
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def _apply_logger_filters(
206206
logger.addFilter(log_filter)
207207

208208

209-
def config_all_loggers(
209+
def setup_loggers(
210210
*,
211211
log_format_local_dev_enabled: bool,
212212
logger_filter_mapping: dict[LoggerName, list[MessageSubstring]],

‎services/agent/src/simcore_service_agent/core/application.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
initialize_fastapi_app_tracing,
1010
setup_tracing,
1111
)
12-
from servicelib.logging_utils import config_all_loggers
12+
from servicelib.logging_utils import setup_loggers
1313

1414
from .._meta import (
1515
API_VTAG,
@@ -34,7 +34,7 @@ def _setup_logger(settings: ApplicationSettings):
3434
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148
3535
logging.basicConfig(level=settings.LOG_LEVEL.value) # NOSONAR
3636
logging.root.setLevel(settings.LOG_LEVEL.value)
37-
config_all_loggers(
37+
setup_loggers(
3838
log_format_local_dev_enabled=settings.AGENT_VOLUMES_LOG_FORMAT_LOCAL_DEV_ENABLED,
3939
logger_filter_mapping=settings.AGENT_VOLUMES_LOG_FILTER_MAPPING,
4040
tracing_settings=settings.AGENT_TRACING,

‎services/api-server/src/simcore_service_api_server/core/application.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
initialize_fastapi_app_tracing,
1010
setup_tracing,
1111
)
12-
from servicelib.logging_utils import config_all_loggers
12+
from servicelib.logging_utils import setup_loggers
1313

1414
from .. import exceptions
1515
from .._meta import API_VERSION, API_VTAG, APP_NAME
@@ -55,7 +55,7 @@ def init_app(settings: ApplicationSettings | None = None) -> FastAPI:
5555

5656
logging.basicConfig(level=settings.log_level)
5757
logging.root.setLevel(settings.log_level)
58-
config_all_loggers(
58+
setup_loggers(
5959
log_format_local_dev_enabled=settings.API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED,
6060
logger_filter_mapping=settings.API_SERVER_LOG_FILTER_MAPPING,
6161
tracing_settings=settings.API_SERVER_TRACING,

‎services/autoscaling/src/simcore_service_autoscaling/main.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
"""Main application to be deployed by uvicorn (or equivalent) server
2-
3-
"""
1+
"""Main application to be deployed by uvicorn (or equivalent) server"""
42

53
import logging
64

75
from fastapi import FastAPI
8-
from servicelib.logging_utils import config_all_loggers
6+
from servicelib.logging_utils import setup_loggers
97
from simcore_service_autoscaling.core.application import create_app
108
from simcore_service_autoscaling.core.settings import ApplicationSettings
119

1210
the_settings = ApplicationSettings.create_from_envs()
1311
logging.basicConfig(level=the_settings.log_level)
1412
logging.root.setLevel(the_settings.log_level)
15-
config_all_loggers(
13+
setup_loggers(
1614
log_format_local_dev_enabled=the_settings.AUTOSCALING_LOG_FORMAT_LOCAL_DEV_ENABLED,
1715
logger_filter_mapping=the_settings.AUTOSCALING_LOG_FILTER_MAPPING,
1816
tracing_settings=the_settings.AUTOSCALING_TRACING,

‎services/catalog/src/simcore_service_catalog/main.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
"""Main application to be deployed in for example uvicorn.
2-
"""
1+
"""Main application to be deployed in for example uvicorn."""
32

43
import logging
54

65
from fastapi import FastAPI
7-
from servicelib.logging_utils import config_all_loggers
6+
from servicelib.logging_utils import setup_loggers
87
from simcore_service_catalog.core.application import create_app
98
from simcore_service_catalog.core.settings import ApplicationSettings
109

@@ -13,7 +12,7 @@
1312
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148
1413
logging.basicConfig(level=_the_settings.log_level) # NOSONAR
1514
logging.root.setLevel(_the_settings.log_level)
16-
config_all_loggers(
15+
setup_loggers(
1716
log_format_local_dev_enabled=_the_settings.CATALOG_LOG_FORMAT_LOCAL_DEV_ENABLED,
1817
logger_filter_mapping=_the_settings.CATALOG_LOG_FILTER_MAPPING,
1918
tracing_settings=_the_settings.CATALOG_TRACING,

‎services/clusters-keeper/src/simcore_service_clusters_keeper/main.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
"""Main application to be deployed by uvicorn (or equivalent) server
2-
3-
"""
1+
"""Main application to be deployed by uvicorn (or equivalent) server"""
42

53
import logging
64

75
from fastapi import FastAPI
8-
from servicelib.logging_utils import config_all_loggers
6+
from servicelib.logging_utils import setup_loggers
97
from simcore_service_clusters_keeper.core.application import create_app
108
from simcore_service_clusters_keeper.core.settings import ApplicationSettings
119

1210
the_settings = ApplicationSettings.create_from_envs()
1311
logging.basicConfig(level=the_settings.log_level)
1412
logging.root.setLevel(the_settings.log_level)
15-
config_all_loggers(
13+
setup_loggers(
1614
log_format_local_dev_enabled=the_settings.CLUSTERS_KEEPER_LOG_FORMAT_LOCAL_DEV_ENABLED,
1715
logger_filter_mapping=the_settings.CLUSTERS_KEEPER_LOG_FILTER_MAPPING,
1816
tracing_settings=the_settings.CLUSTERS_KEEPER_TRACING,

‎services/dask-sidecar/src/simcore_service_dask_sidecar/utils/logs.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import logging
22

3-
from servicelib.logging_utils import config_all_loggers
3+
from servicelib.logging_utils import setup_loggers
44

55
from ..settings import ApplicationSettings
66

@@ -13,7 +13,7 @@ def setup_app_logging(settings: ApplicationSettings) -> None:
1313
# removing them solves dual propagation of logs
1414
for handler in logging.getLogger("distributed").handlers:
1515
logging.getLogger("distributed").removeHandler(handler)
16-
config_all_loggers(
16+
setup_loggers(
1717
log_format_local_dev_enabled=settings.DASK_LOG_FORMAT_LOCAL_DEV_ENABLED,
1818
logger_filter_mapping=settings.DASK_LOG_FILTER_MAPPING,
1919
tracing_settings=None, # no tracing for dask sidecar

‎services/datcore-adapter/src/simcore_service_datcore_adapter/main.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import logging
44

55
from fastapi import FastAPI
6-
from servicelib.logging_utils import config_all_loggers
6+
from servicelib.logging_utils import setup_loggers
77
from simcore_service_datcore_adapter.core.application import create_app
88
from simcore_service_datcore_adapter.core.settings import ApplicationSettings
99

@@ -12,7 +12,7 @@
1212
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148
1313
logging.basicConfig(level=_the_settings.log_level) # NOSONAR
1414
logging.root.setLevel(_the_settings.log_level)
15-
config_all_loggers(
15+
setup_loggers(
1616
log_format_local_dev_enabled=_the_settings.DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED,
1717
logger_filter_mapping=_the_settings.DATCORE_ADAPTER_LOG_FILTER_MAPPING,
1818
tracing_settings=_the_settings.DATCORE_ADAPTER_TRACING,

‎services/director-v2/src/simcore_service_director_v2/core/application.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
initialize_fastapi_app_tracing,
1212
setup_tracing,
1313
)
14-
from servicelib.logging_utils import config_all_loggers
14+
from servicelib.logging_utils import setup_loggers
1515

1616
from .._meta import API_VERSION, API_VTAG, APP_NAME, PROJECT_NAME, SUMMARY
1717
from ..api.entrypoints import api_router
@@ -110,7 +110,7 @@ def create_base_app(settings: AppSettings | None = None) -> FastAPI:
110110

111111
logging.basicConfig(level=settings.LOG_LEVEL.value)
112112
logging.root.setLevel(settings.LOG_LEVEL.value)
113-
config_all_loggers(
113+
setup_loggers(
114114
log_format_local_dev_enabled=settings.DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED,
115115
logger_filter_mapping=settings.DIRECTOR_V2_LOG_FILTER_MAPPING,
116116
tracing_settings=settings.DIRECTOR_V2_TRACING,
@@ -202,7 +202,9 @@ def init_app(settings: AppSettings | None = None) -> FastAPI:
202202
socketio.setup(app)
203203
notifier.setup(app)
204204

205-
if settings.DIRECTOR_V2_COMPUTATIONAL_BACKEND.COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED:
205+
if (
206+
settings.DIRECTOR_V2_COMPUTATIONAL_BACKEND.COMPUTATIONAL_BACKEND_DASK_CLIENT_ENABLED
207+
):
206208
dask_clients_pool.setup(app, settings.DIRECTOR_V2_COMPUTATIONAL_BACKEND)
207209

208210
if computational_backend_enabled:

‎services/director/src/simcore_service_director/main.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
"""Main application to be deployed by uvicorn (or equivalent) server
2-
3-
"""
1+
"""Main application to be deployed by uvicorn (or equivalent) server"""
42

53
import logging
64

75
from fastapi import FastAPI
8-
from servicelib.logging_utils import config_all_loggers
6+
from servicelib.logging_utils import setup_loggers
97
from simcore_service_director.core.application import create_app
108
from simcore_service_director.core.settings import ApplicationSettings
119

@@ -14,7 +12,7 @@
1412
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148
1513
logging.basicConfig(level=_the_settings.DIRECTOR_LOGLEVEL)
1614
logging.root.setLevel(_the_settings.DIRECTOR_LOGLEVEL)
17-
config_all_loggers(
15+
setup_loggers(
1816
log_format_local_dev_enabled=_the_settings.DIRECTOR_LOG_FORMAT_LOCAL_DEV_ENABLED,
1917
logger_filter_mapping=_the_settings.DIRECTOR_LOG_FILTER_MAPPING,
2018
tracing_settings=_the_settings.DIRECTOR_TRACING,

0 commit comments

Comments
 (0)