Add color settings, restore enable_access_log setting effectiveness

Flagsmith · Jun 17, 2024 · 5a36f31 · 5a36f31
1 parent ec9a69e
commit 5a36f31
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/edge_proxy/logging.py b/src/edge_proxy/logging.py
@@ -64,6 +64,14 @@ def setup_logging(settings: LoggingSettings) -> None:
         cache_logger_on_first_use=True,
     )
 
+    # Propagate uvicorn logs instead of letting uvicorn configure the format
+    for name in ["uvicorn", "uvicorn.error"]:
+        logging.getLogger(name).handlers.clear()
+        logging.getLogger(name).propagate = True
+
+    logging.getLogger("uvicorn.access").handlers.clear()
+    logging.getLogger("uvicorn.access").propagate = settings.enable_access_log
+
     override = settings.override
     logging.config.dictConfig(
         {
@@ -77,7 +85,8 @@ def setup_logging(settings: LoggingSettings) -> None:
                     "processors": [
                         structlog.stdlib.ProcessorFormatter.remove_processors_meta,
                         structlog.dev.ConsoleRenderer(
-                            event_key=settings.log_event_field_name, colors=True
+                            event_key=settings.log_event_field_name,
+                            colors=settings.colors,
                         ),
                     ],
                     "foreign_pre_chain": processors,
@@ -108,13 +117,6 @@ def setup_logging(settings: LoggingSettings) -> None:
                     "level": settings.log_level.to_logging_log_level(),
                     "propagate": True,
                 },
-                "uvicorn.access": {
-                    "handlers": ["default"],
-                    "disabled": not settings.enable_access_log,
-                },
-                "uvicorn.error": {
-                    "handlers": ["default"],
-                },
                 **(override.get("loggers") or {}),
             },
         }

diff --git a/src/edge_proxy/main.py b/src/edge_proxy/main.py
@@ -10,6 +10,7 @@ def serve():
         host=str(settings.server.host),
         port=settings.server.port,
         reload=settings.server.reload,
+        use_colors=settings.logging.colors,
     )
 
 

diff --git a/src/edge_proxy/settings.py b/src/edge_proxy/settings.py
@@ -84,6 +84,7 @@ class LoggingSettings(BaseModel):
     log_format: LogFormat = LogFormat.GENERIC
     log_level: LogLevel = LogLevel.INFO
     log_event_field_name: str = "message"
+    colors: bool = True
     override: dict[str, Any] = Field(default_factory=dict)