Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for dictConfig with json file #742

Merged
merged 6 commits into from
Sep 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions mlserver/logging.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import json
import logging
import sys

from logging import Formatter, StreamHandler
from pathlib import Path
from typing import Dict, Union
import logging.config

from .settings import Settings
Expand All @@ -16,8 +19,20 @@ def get_logger():
return logger


def apply_logging_file(logging_settings: str):
logging.config.fileConfig(fname=logging_settings, disable_existing_loggers=False)
def apply_logging_file(logging_settings: Union[str, Dict]):
if isinstance(logging_settings, str) and Path(logging_settings).is_file():
if "json" in Path(logging_settings).suffix:
with open(logging_settings) as settings_file:
config = json.load(settings_file)
logging.config.dictConfig(config)
else:
logging.config.fileConfig(
fname=logging_settings, disable_existing_loggers=False
)
elif isinstance(logging_settings, Dict):
logging.config.dictConfig(logging_settings)
else:
logger.warning("Unable to parse logging_settings.")


def configure_logger(settings: Settings = None):
Expand Down
6 changes: 3 additions & 3 deletions mlserver/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import json
import importlib

from typing import Any, List, Optional
from typing import Any, Dict, List, Optional, Union
from pydantic import BaseSettings, PyObject, Field
from contextlib import contextmanager

Expand Down Expand Up @@ -137,8 +137,8 @@ class Config:
"""

# Logging settings
logging_settings: Optional[str] = None
"""Path to logging config file."""
logging_settings: Optional[Union[str, Dict]] = None
"""Path to logging config file or dictionary configuration."""

# Kakfa Server settings
kafka_enabled: bool = False
Expand Down