From 19a2278523671fe82984e43c91986730e6fceaff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi@yaal.coop>
Date: Mon, 13 Jan 2025 09:30:05 +0100
Subject: [PATCH] =?UTF-8?q?refactor:=C2=A0logging=20default=20config=20avo?=
 =?UTF-8?q?id=20to=20use=20dictConfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

so it does not overwrite the default logging configuration
---
 canaille/app/logging.py | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/canaille/app/logging.py b/canaille/app/logging.py
index 83c139e6..08f34d92 100644
--- a/canaille/app/logging.py
+++ b/canaille/app/logging.py
@@ -4,6 +4,7 @@
 
 from flask import has_request_context
 from flask import request
+from flask.logging import default_handler
 
 
 class IPFilter(logging.Filter):
@@ -62,30 +63,18 @@ def setup_logging(app):
         add_log_level(security_level_name, security_level)
 
     if conf is None:
+        root_logger = logging.getLogger()
+        root_logger.setLevel(logging.WARNING)
+
         log_level = "DEBUG" if app.debug else "INFO"
-        dictConfig(
-            {
-                "version": 1,
-                "formatters": {
-                    "default": {
-                        "format": "[%(asctime)s] - %(ip)s - %(levelname)s in %(module)s: %(message)s",
-                    }
-                },
-                "handlers": {
-                    "wsgi": {
-                        "class": "logging.StreamHandler",
-                        "stream": "ext://flask.logging.wsgi_errors_stream",
-                        "formatter": "default",
-                    }
-                },
-                "root": {"level": log_level, "handlers": ["wsgi"]},
-                "loggers": {
-                    "faker": {"level": "WARNING"},
-                    "mail.log": {"level": "WARNING"},
-                },
-                "disable_existing_loggers": False,
-            }
+        formatter = logging.Formatter(
+            "[%(asctime)s] - %(ip)s - %(levelname)s in %(module)s: %(message)s"
         )
+        handler = logging.StreamHandler(stream="ext://flask.logging.wsgi_errors_stream")
+        handler.setFormatter(formatter)
+        app.logger.setLevel(log_level)
+        app.logger.removeHandler(default_handler)
+        app.logger.addHandler(handler)
 
     elif isinstance(conf, dict):
         dictConfig(conf)