File tree Expand file tree Collapse file tree 14 files changed +27
-27
lines changed
packages/service-library/src/servicelib/fastapi
agent/src/simcore_service_agent
api-server/src/simcore_service_api_server
autoscaling/src/simcore_service_autoscaling
clusters-keeper/src/simcore_service_clusters_keeper
datcore-adapter/src/simcore_service_datcore_adapter
director-v2/src/simcore_service_director_v2/core
director/src/simcore_service_director
dynamic-sidecar/src/simcore_service_dynamic_sidecar/core
efs-guardian/src/simcore_service_efs_guardian
invitations/src/simcore_service_invitations
payments/src/simcore_service_payments
resource-usage-tracker/src/simcore_service_resource_usage_tracker
storage/src/simcore_service_storage Expand file tree Collapse file tree 14 files changed +27
-27
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ async def _logging_lifespan(app: FastAPI) -> AsyncIterator[None]:
4545 return _logging_lifespan
4646
4747
48- def setup_logging_shutdown_event (
48+ def create_logging_shutdown_event (
4949 * ,
5050 log_format_local_dev_enabled : bool ,
5151 logger_filter_mapping : dict [LoggerName , list [MessageSubstring ]],
Original file line number Diff line number Diff line change 33
44from common_library .json_serialization import json_dumps
55from fastapi import FastAPI
6- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
6+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
77from simcore_service_agent .core .application import create_app
88from simcore_service_agent .core .settings import ApplicationSettings
99
1919
2020def app_factory () -> FastAPI :
2121 app_settings = ApplicationSettings .create_from_envs ()
22- logging_shutdown_event = setup_logging_shutdown_event (
22+ logging_shutdown_event = create_logging_shutdown_event (
2323 log_format_local_dev_enabled = app_settings .AGENT_VOLUMES_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2424 logger_filter_mapping = app_settings .AGENT_VOLUMES_LOG_FILTER_MAPPING ,
2525 tracing_settings = app_settings .AGENT_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_api_server .core .application import create_app
1010from simcore_service_api_server .core .settings import ApplicationSettings
1111
2121
2222def app_factory () -> FastAPI :
2323 app_settings = ApplicationSettings .create_from_envs ()
24- logging_shutdown_event = setup_logging_shutdown_event (
24+ logging_shutdown_event = create_logging_shutdown_event (
2525 log_format_local_dev_enabled = app_settings .API_SERVER_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2626 logger_filter_mapping = app_settings .API_SERVER_LOG_FILTER_MAPPING ,
2727 tracing_settings = app_settings .API_SERVER_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_autoscaling .core .application import create_app
1010from simcore_service_autoscaling .core .settings import ApplicationSettings
1111
2222
2323def app_factory () -> FastAPI :
2424 app_settings = ApplicationSettings .create_from_envs ()
25- logging_shutdown_event = setup_logging_shutdown_event (
25+ logging_shutdown_event = create_logging_shutdown_event (
2626 log_format_local_dev_enabled = app_settings .AUTOSCALING_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2727 logger_filter_mapping = app_settings .AUTOSCALING_LOG_FILTER_MAPPING ,
2828 tracing_settings = app_settings .AUTOSCALING_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_clusters_keeper .core .application import create_app
1010from simcore_service_clusters_keeper .core .settings import ApplicationSettings
1111
2222
2323def app_factory () -> FastAPI :
2424 app_settings = ApplicationSettings .create_from_envs ()
25- logging_shutdown_event = setup_logging_shutdown_event (
25+ logging_shutdown_event = create_logging_shutdown_event (
2626 log_format_local_dev_enabled = app_settings .CLUSTERS_KEEPER_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2727 logger_filter_mapping = app_settings .CLUSTERS_KEEPER_LOG_FILTER_MAPPING ,
2828 tracing_settings = app_settings .CLUSTERS_KEEPER_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_datcore_adapter .core .application import create_app
1010from simcore_service_datcore_adapter .core .settings import ApplicationSettings
1111
2020
2121def app_factory () -> FastAPI :
2222 app_settings = ApplicationSettings .create_from_envs ()
23- logging_shutdown_event = setup_logging_shutdown_event (
23+ logging_shutdown_event = create_logging_shutdown_event (
2424 log_format_local_dev_enabled = app_settings .DATCORE_ADAPTER_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2525 logger_filter_mapping = app_settings .DATCORE_ADAPTER_LOG_FILTER_MAPPING ,
2626 tracing_settings = app_settings .DATCORE_ADAPTER_TRACING ,
Original file line number Diff line number Diff line change 66from fastapi .exceptions import RequestValidationError
77from fastapi_lifespan_manager import LifespanManager
88from servicelib .fastapi .lifespan_utils import Lifespan
9- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
9+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
1010from servicelib .fastapi .openapi import (
1111 get_common_oas_options ,
1212 override_fastapi_openapi_method ,
@@ -118,7 +118,7 @@ def create_base_app(
118118 if app_settings is None :
119119 app_settings = AppSettings .create_from_envs ()
120120
121- logging_shutdown_event = setup_logging_shutdown_event (
121+ logging_shutdown_event = create_logging_shutdown_event (
122122 log_format_local_dev_enabled = app_settings .DIRECTOR_V2_LOG_FORMAT_LOCAL_DEV_ENABLED ,
123123 logger_filter_mapping = app_settings .DIRECTOR_V2_LOG_FILTER_MAPPING ,
124124 tracing_settings = app_settings .DIRECTOR_V2_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_director .core .application import create_app
1010from simcore_service_director .core .settings import ApplicationSettings
1111
2020
2121def app_factory () -> FastAPI :
2222 app_settings = ApplicationSettings .create_from_envs ()
23- logging_shutdown_event = setup_logging_shutdown_event (
23+ logging_shutdown_event = create_logging_shutdown_event (
2424 log_format_local_dev_enabled = app_settings .DIRECTOR_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2525 logger_filter_mapping = app_settings .DIRECTOR_LOG_FILTER_MAPPING ,
2626 tracing_settings = app_settings .DIRECTOR_TRACING ,
Original file line number Diff line number Diff line change 66from fastapi import FastAPI
77from servicelib .async_utils import cancel_sequential_workers
88from servicelib .fastapi import long_running_tasks
9- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
9+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
1010from servicelib .fastapi .openapi import (
1111 get_common_oas_options ,
1212 override_fastapi_openapi_method ,
@@ -118,7 +118,7 @@ def compose_spec(self) -> str | None:
118118def create_base_app () -> FastAPI :
119119 # settings
120120 app_settings = ApplicationSettings .create_from_envs ()
121- logging_shutdown_event = setup_logging_shutdown_event (
121+ logging_shutdown_event = create_logging_shutdown_event (
122122 log_format_local_dev_enabled = app_settings .DY_SIDECAR_LOG_FORMAT_LOCAL_DEV_ENABLED ,
123123 logger_filter_mapping = app_settings .DY_SIDECAR_LOG_FILTER_MAPPING ,
124124 tracing_settings = app_settings .DYNAMIC_SIDECAR_TRACING ,
Original file line number Diff line number Diff line change 55
66from common_library .json_serialization import json_dumps
77from fastapi import FastAPI
8- from servicelib .fastapi .logging_lifespan import setup_logging_shutdown_event
8+ from servicelib .fastapi .logging_lifespan import create_logging_shutdown_event
99from simcore_service_efs_guardian .core .application import create_app
1010from simcore_service_efs_guardian .core .settings import ApplicationSettings
1111
2222
2323def app_factory () -> FastAPI :
2424 app_settings = ApplicationSettings .create_from_envs ()
25- logging_shutdown_event = setup_logging_shutdown_event (
25+ logging_shutdown_event = create_logging_shutdown_event (
2626 log_format_local_dev_enabled = app_settings .EFS_GUARDIAN_LOG_FORMAT_LOCAL_DEV_ENABLED ,
2727 logger_filter_mapping = app_settings .EFS_GUARDIAN_LOG_FILTER_MAPPING ,
2828 tracing_settings = app_settings .EFS_GUARDIAN_TRACING ,
You can’t perform that action at this time.
0 commit comments