Set level of repetable logs to debug (#909)

CERT-Polska · Feb 12, 2024 · 0661052 · 0661052
1 parent e44c58a
commit 0661052
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/mwdb/app.py b/mwdb/app.py
@@ -136,7 +136,7 @@ class HashConverter(BaseConverter):
 def assign_request_id():
     g.request_id = token_hex(16)
     g.request_start_time = datetime.utcnow()
-    getLogger().info(
+    getLogger().debug(
         "before_request",
         extra={
             "path": request.path,
@@ -156,7 +156,7 @@ def log_request(response):
         response_time = None
     response_size = response.calculate_content_length()
 
-    getLogger().info(
+    getLogger().debug(
         "request",
         extra={
             "path": request.path,
@@ -195,7 +195,7 @@ def require_auth():
         if g.auth_user is None:
             g.auth_user = User.verify_legacy_token(token)
             if g.auth_user is not None:
-                getLogger().warning(
+                getLogger().debug(
                     "'%s' used legacy auth token for authentication", g.auth_user.login
                 )
 

diff --git a/mwdb/core/config.py b/mwdb/core/config.py
@@ -134,6 +134,7 @@ class MWDBConfig(Config):
     enable_sql_profiler = key(cast=intbool, required=False, default=False)
     log_only_slow_sql = key(cast=intbool, required=False, default=False)
     use_x_forwarded_for = key(cast=intbool, required=False, default=False)
+    enable_debug_log = key(cast=intbool, required=False, default=False)
 
 
 @section("karton")

diff --git a/mwdb/core/log.py b/mwdb/core/log.py
@@ -45,20 +45,15 @@ def setup_logger():
 
     if enable_json_logger:
         formatter = jsonlogger.JsonFormatter(
-            fmt="%(filename) %(funcName) %(levelname) "
-            "%(lineno) %(module) %(threadName) %(message)",
+            fmt="%(funcName) %(levelname) %(message)",
             timestamp=True,
         )
     else:
-        formatter = InlineFormatter(
-            fmt="[%(levelname)s] %(threadName)s "
-            "- %(module)s.%(funcName)s:%(lineno)s"
-            " - %(message)s"
-        )
+        formatter = InlineFormatter(fmt="[%(levelname)s] - %(funcName)s - %(message)s")
     handler.setFormatter(formatter)
     handler.addFilter(ContextFilter())
     logger.addHandler(handler)
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.DEBUG if app_config.mwdb.enable_debug_log else logging.INFO)
 
 
 def getLogger():

diff --git a/mwdb/resources/__init__.py b/mwdb/resources/__init__.py
@@ -56,7 +56,7 @@ def deprecated(f):
 
     @wraps(f)
     def endpoint(*args, **kwargs):
-        logger.warning("Used deprecated endpoint: %s", request.path)
+        logger.debug("Used deprecated endpoint: %s", request.path)
         return f(*args, **kwargs)
 
     return endpoint

diff --git a/mwdb/resources/auth.py b/mwdb/resources/auth.py
@@ -419,7 +419,7 @@ def post(self):
         user.logged_on = datetime.datetime.now()
         db.session.commit()
 
-        logger.info("Session token refreshed", extra={"user": user.login})
+        logger.debug("Session token refreshed", extra={"user": user.login})
         schema = AuthSuccessResponseSchema()
         return schema.dump(
             {
@@ -453,7 +453,7 @@ def get(self):
         """
         user = g.auth_user
 
-        logger.info("Token validated", extra={"user": user.login})
+        logger.debug("Token validated", extra={"user": user.login})
         schema = AuthValidateTokenResponseSchema()
         return schema.dump(
             {