diff --git a/main.py b/main.py index b645f91..607ceb4 100644 --- a/main.py +++ b/main.py @@ -8,13 +8,8 @@ from src.configuration import EnvConf, LogConf, singleton class Main(): env_conf: EnvConf @inject - def __init__(self, log_config: LogConf, env_conf: EnvConf, log_handler: LogHandler) -> None: + def __init__(self, log_config: LogConf, env_conf: EnvConf) -> None: self.env_conf=env_conf - logging.basicConfig( - handlers=[log_handler], - level=log_config.level, - datefmt=log_config.time_format, - format='%(asctime)s %(message)s') def run(self): logger = logging.getLogger(__name__) diff --git a/src/configuration.py b/src/configuration.py index 81d425f..f99ebac 100644 --- a/src/configuration.py +++ b/src/configuration.py @@ -27,17 +27,17 @@ class Configuration(): bbb: ccc: "hello world" """ - def get(self, path: str | list[str], cfg: dict = None, default = None): + def get(self, path: str | list[str], cfg: dict = None, default=None): if isinstance(path, str): if cfg is None: cfg = self.cfg return self.get(path.split("."), cfg) length = len(path) if length == 0 or not isinstance(cfg, dict): - return None + return default if length == 1: return cfg.get(path[0]) - return self.get(path[1:], cfg.get(path[0]), default=default) + return self.get(path[1:], cfg.get(path[0])) class TesouConf(): url: str