Use recommended dictConfig for logger configuration

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
     entry: bash -c "poetry run mypy ."
     language: system
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.2.1
+  rev: v0.3.3
   hooks:
   - id: ruff
   - id: ruff-format

ixmp4/conf/base.py

@@ -9,8 +9,6 @@ class PlatformInfo(pydantic.BaseModel):
 
 
 class Config(Protocol):
-    def list_platforms(self) -> list[PlatformInfo]:
-        ...
+    def list_platforms(self) -> list[PlatformInfo]: ...
 
-    def get_platform(self, key: str) -> PlatformInfo:
-        ...
+    def get_platform(self, key: str) -> PlatformInfo: ...

ixmp4/conf/logging/debug.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "formatters":{
+    "generic": {
+      "format": "[%(levelname)s] %(asctime)s - %(name)s: %(message)s",
+      "datefmt": "%H:%M:%S"
+    } 
+  },
+  "root": {
+    "level": "DEBUG",
+    "handlers": ["console"]
+  },
+  "handlers":{
+    "console":{
+      "class": "logging.StreamHandler",
+      "level": "NOTSET",
+      "formatter": "generic"
+    }
+  }
+}

ixmp4/conf/logging/development.json

@@ -0,0 +1,21 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "formatters":{
+    "generic":{ 
+      "format": "[%(levelname)s] %(asctime)s - %(name)s: %(message)s",
+      "datefmt": "%H:%M:%S"
+    }
+  },
+  "root":{ 
+    "level": "INFO",
+    "handlers": ["console"]
+  },
+  "handlers":{
+    "console":{
+      "class": "logging.StreamHandler",
+      "level": "NOTSET",
+      "formatter": "generic"
+    }
+  }
+}

ixmp4/conf/logging/production.json

@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "formatters": {
+    "generic": {
+      "format": "[%(levelname)s] %(asctime)s - %(name)s: %(message)s",
+      "datefmt": "%H:%M:%S"
+    }
+  },
+  "loggers": {
+    "ixmp4": {
+      "level": "INFO",
+      "handlers": ["console"]
+    }
+  },
+  "handlers": {
+    "console": {
+      "class": "logging.StreamHandler",
+      "level": "NOTSET",
+      "formatter": "generic"
+    }
+  }
+}

ixmp4/conf/logging/server.json

@@ -0,0 +1,71 @@
+{
+  "version": 1,
+  "disable_existing_loggers": false,
+  "formatters":{
+    "generic": {
+      "format": "[%(levelname)s] %(asctime)s - %(name)s: %(message)s",
+      "datefmt": "%H:%M:%S"
+    }
+  },
+  "loggers": {
+    "fastapi": {
+      "level": "NOTSET",
+      "handlers": ["debug","error","console"]
+    },
+    "httpx": {
+      "level": "NOTSET",
+      "handlers": ["debug","error"]
+    },
+    "sqlalchemy": {
+      "level": "NOTSET",
+      "handlers": ["debug","error"]
+    },
+    "uvicorn": {
+      "level": "NOTSET",
+      "handlers": ["debug","error","console"]
+    },
+    "uvicorn.access": {
+      "level": "NOTSET",
+      "handlers": ["access"]
+    },
+    "watchfiles.main": {
+      "level": "ERROR",
+      "handlers": ["error","debug"]
+    }
+  },
+  "handlers": {
+    "access": {
+      "class": "logging.handlers.RotatingFileHandler",
+      "level": "INFO",
+      "formatter": "generic",
+      "filename": "os.getenv('IXMP4_ACCESS_LOG')",
+      "mode": "a",
+      "maxBytes": 250000
+    },
+    "console": {
+      "class": "logging.StreamHandler",
+      "level": "INFO",
+      "formatter": "generic"
+    },
+    "debug": {
+      "class": "logging.handlers.RotatingFileHandler",
+      "level": "DEBUG",
+      "formatter": "generic",
+      "filename": "os.getenv('IXMP4_DEBUG_LOG')", 
+      "mode": "a",
+      "maxBytes": 250000
+    },
+    "error": {
+      "class": "logging.handlers.RotatingFileHandler",
+      "level": "WARN",
+      "formatter": "generic",
+      "filename": "os.getenv('IXMP4_ERROR_LOG')",
+      "mode": "a",
+      "maxBytes": 250000
+    }
+  },
+  "root": { 
+    "level": "NOTSET",
+    "handlers": ["debug","error"]
+  }
+}

ixmp4/conf/settings.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import logging.config
 import os
@@ -22,9 +23,9 @@
 
 
 class Settings(BaseSettings):
-    mode: Literal["production"] | Literal["development"] | Literal[
-        "debug"
-    ] = "production"
+    mode: Literal["production"] | Literal["development"] | Literal["debug"] = (
+        "production"
+    )
     storage_directory: Path = Field(
         "~/.local/share/ixmp4/", json_schema_extra={"env": "ixmp4_dir"}
     )
@@ -144,8 +145,10 @@ def configure_logging(self, config: str):
         os.environ.setdefault("IXMP4_DEBUG_LOG", str(debug_file.absolute()))
         os.environ.setdefault("IXMP4_ERROR_LOG", str(error_file.absolute()))
 
-        logging_config = here / f"logging/{config}.conf"
-        logging.config.fileConfig(logging_config, disable_existing_loggers=False)
+        logging_config = here / f"logging/{config}.json"
+        with open(logging_config, "r") as file:
+            config_dict = json.load(file)
+        logging.config.dictConfig(config_dict)
 
     def check_credentials(self):
         if self.default_credentials is not None: