From 4f4ec7bce98db9e9923bb87a469726e9723f3bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Boullosa=20Garc=C3=ADa?= Date: Tue, 22 Mar 2022 13:58:45 +0100 Subject: [PATCH 1/5] uvicorn logging settings --- mlserver/rest/server.py | 2 +- mlserver/settings.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mlserver/rest/server.py b/mlserver/rest/server.py index d0ca04b79..a5405f358 100644 --- a/mlserver/rest/server.py +++ b/mlserver/rest/server.py @@ -53,7 +53,7 @@ async def delete_custom_handlers(self, model: MLModel): async def start(self): cfg = uvicorn.Config( - self._app, host=self._settings.host, port=self._settings.http_port + self._app, host=self._settings.host, port=self._settings.http_port, log_config=self._settings.uvicorn_logging_settings ) self._server = _NoSignalServer(cfg) await self._server.serve() diff --git a/mlserver/settings.py b/mlserver/settings.py index 7a208b783..e4e8d968a 100644 --- a/mlserver/settings.py +++ b/mlserver/settings.py @@ -89,6 +89,10 @@ class Config: `None` to disable it """ + # Logging settings + uvicorn_logging_settings: Optional[str] = None + """Path to uvicorn logging config file""" + class ModelParameters(BaseSettings): """ From 978cd62eab8868742b7d92041b7ff4775f0bf600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Boullosa=20Garc=C3=ADa?= Date: Thu, 21 Apr 2022 11:21:23 +0200 Subject: [PATCH 2/5] update logging config --- mlserver/logging.py | 8 ++++++++ mlserver/rest/server.py | 2 +- mlserver/settings.py | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mlserver/logging.py b/mlserver/logging.py index 224cc5955..4470d7efb 100644 --- a/mlserver/logging.py +++ b/mlserver/logging.py @@ -14,6 +14,11 @@ def get_logger(): return logger +def apply_logging_file(settings: Settings): + logging.config.fileConfig( + settings.logging_settings, disable_existing_loggers=False + ) + def configure_logger(settings: Settings = None): logger = get_logger() @@ -30,4 +35,7 @@ def configure_logger(settings: Settings = None): if settings and settings.debug: logger.setLevel(logging.DEBUG) + if settings and settings.logging_settings: + apply_logging_file(settings) + return logger diff --git a/mlserver/rest/server.py b/mlserver/rest/server.py index a5405f358..8552500ca 100644 --- a/mlserver/rest/server.py +++ b/mlserver/rest/server.py @@ -53,7 +53,7 @@ async def delete_custom_handlers(self, model: MLModel): async def start(self): cfg = uvicorn.Config( - self._app, host=self._settings.host, port=self._settings.http_port, log_config=self._settings.uvicorn_logging_settings + self._app, host=self._settings.host, port=self._settings.http_port, log_config=self._settings.logging_settings ) self._server = _NoSignalServer(cfg) await self._server.serve() diff --git a/mlserver/settings.py b/mlserver/settings.py index e4e8d968a..b9b08bfc8 100644 --- a/mlserver/settings.py +++ b/mlserver/settings.py @@ -90,8 +90,8 @@ class Config: """ # Logging settings - uvicorn_logging_settings: Optional[str] = None - """Path to uvicorn logging config file""" + logging_settings: Optional[str] = None + """Path to logging config file""" class ModelParameters(BaseSettings): From 1ee08b9774e5a30231b9a53cb47ea3568594dc10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Boullosa=20Garc=C3=ADa?= Date: Mon, 25 Apr 2022 09:14:50 +0200 Subject: [PATCH 3/5] Adding missing import --- mlserver/logging.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mlserver/logging.py b/mlserver/logging.py index 4470d7efb..f58ae6df4 100644 --- a/mlserver/logging.py +++ b/mlserver/logging.py @@ -2,6 +2,7 @@ import sys from logging import Formatter, StreamHandler +import logging.config from .settings import Settings From 37bfb6d270e1d3f33c73270c84794ee2eb8082d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Boullosa=20Garc=C3=ADa?= Date: Tue, 3 May 2022 12:04:36 +0200 Subject: [PATCH 4/5] fix logging config --- mlserver/logging.py | 3 ++- mlserver/rest/server.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mlserver/logging.py b/mlserver/logging.py index f58ae6df4..edd61818f 100644 --- a/mlserver/logging.py +++ b/mlserver/logging.py @@ -15,9 +15,10 @@ def get_logger(): return logger + def apply_logging_file(settings: Settings): logging.config.fileConfig( - settings.logging_settings, disable_existing_loggers=False + fname=settings.logging_settings, disable_existing_loggers=False ) diff --git a/mlserver/rest/server.py b/mlserver/rest/server.py index 8552500ca..98e730404 100644 --- a/mlserver/rest/server.py +++ b/mlserver/rest/server.py @@ -53,7 +53,10 @@ async def delete_custom_handlers(self, model: MLModel): async def start(self): cfg = uvicorn.Config( - self._app, host=self._settings.host, port=self._settings.http_port, log_config=self._settings.logging_settings + self._app, + host=self._settings.host, + port=self._settings.http_port, + log_config=self._settings.logging_settings, ) self._server = _NoSignalServer(cfg) await self._server.serve() From 2fa1fcb751493dad021e610f9e1d614bb780de39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Boullosa=20Garc=C3=ADa?= Date: Tue, 3 May 2022 16:59:41 +0200 Subject: [PATCH 5/5] fix logging config --- mlserver/logging.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mlserver/logging.py b/mlserver/logging.py index edd61818f..299b6c199 100644 --- a/mlserver/logging.py +++ b/mlserver/logging.py @@ -16,10 +16,8 @@ def get_logger(): return logger -def apply_logging_file(settings: Settings): - logging.config.fileConfig( - fname=settings.logging_settings, disable_existing_loggers=False - ) +def apply_logging_file(logging_settings: str): + logging.config.fileConfig(fname=logging_settings, disable_existing_loggers=False) def configure_logger(settings: Settings = None): @@ -38,6 +36,6 @@ def configure_logger(settings: Settings = None): logger.setLevel(logging.DEBUG) if settings and settings.logging_settings: - apply_logging_file(settings) + apply_logging_file(settings.logging_settings) return logger