feat: add log file

EuleMitKeule · Mar 10, 2023 · e53ebc7 · e53ebc7
1 parent 42d234d
commit e53ebc7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,8 @@ RUN poetry install
 
 ENV CONFIG_PATH /config/config.yml
 ENV DB_PATH /config/estimenergy.db
+ENV LOG_PATH /config/estimenergy.log
+ENV LOG_LEVEL INFO
 ENV ENABLE_METRICS true
 
 VOLUME /config

diff --git a/estimenergy/collectors/glow_collector.py b/estimenergy/collectors/glow_collector.py
@@ -25,7 +25,7 @@ def __init__(
         collector_data: CollectorData
     ):
         self.collector_data = collector_data
-        self.logger = logging.getLogger("energy_collector").getChild(self.collector_data.name)
+        self.logger = logging.getLogger("estimenergy").getChild(self.collector_data.name)
 
         self.logger.info(f"Creating API Client for {self.collector_data.name} ({self.collector_data.host}:{self.collector_data.port})")
 

diff --git a/estimenergy/const.py b/estimenergy/const.py
@@ -92,9 +92,10 @@ def create_gauge(self, registry) -> Gauge:
             "()": "uvicorn.logging.ColourizedFormatter",
             "format": "%(asctime)-25s %(name)-30s %(levelprefix)-8s %(message)s",
         },
-        "access": {
+        "file": {
             "()": "uvicorn.logging.ColourizedFormatter",
             "format": "%(asctime)-25s %(name)-30s %(levelprefix)-8s %(message)s",
+            "use_colors": False
         },
     },
     "handlers": {
@@ -104,25 +105,30 @@ def create_gauge(self, registry) -> Gauge:
             "stream": "ext://sys.stderr",
         },
         "access": {
-            "formatter": "access",
+            "formatter": "default",
             "class": "logging.StreamHandler",
             "stream": "ext://sys.stdout",
         },
+        "file": {
+            "formatter": "file",
+            "class": "logging.FileHandler",
+            "filename": "energy_collector.log",
+        }
     },
     "loggers": {
         "uvicorn.error": {
             "level": "INFO",
-            "handlers": ["default"],
+            "handlers": ["default", "file"],
             "propagate": False,
         },
         "uvicorn.access": {
             "level": "INFO",
-            "handlers": ["access"],
+            "handlers": ["access", "file"],
             "propagate": False,
         },
-        "energy_collector": {
-            "level": "DEBUG",
-            "handlers": ["default"],
+        "estimenergy": {
+            "level": "INFO",
+            "handlers": ["default", "file"],
             "propagate": False,
         },
     },

diff --git a/estimenergy/main.py b/estimenergy/main.py
@@ -1,4 +1,5 @@
 
+import logging
 import uvicorn
 import asyncio
 from fastapi import FastAPI
@@ -31,6 +32,14 @@
 app.include_router(collector_router.router)
 
 def start():
+    if settings.log_path is not None and settings.log_path != "":
+        LOGGING_CONFIG["handlers"]["file"]["filename"] = settings.log_path
+
+    if settings.log_level is not None and settings.log_level != "":
+        LOGGING_CONFIG["loggers"]["uvicorn.error"]["level"] = settings.log_level
+        LOGGING_CONFIG["loggers"]["uvicorn.access"]["level"] = settings.log_level
+        LOGGING_CONFIG["loggers"]["estimenergy"]["level"] = settings.log_level
+
     uvicorn.run(
         "estimenergy.main:app",
         host="0.0.0.0",

diff --git a/estimenergy/models/settings.py b/estimenergy/models/settings.py
@@ -7,6 +7,8 @@ class Settings(BaseSettings):
     config_path: str = "config.yml"
     log_config_path: str = "logging.yml"
     db_path: str = "estimenergy.db"
+    log_path: str = "estimenergy.log"
+    log_level: str = "INFO"
     enable_metrics: bool = True
     reload: bool = False