Load MessageLoggerMiddleware based on logger's effective level (#1966)

Author: josumoreno-BP

tests/test_config.py

@@ -5,6 +5,7 @@
 import sys
 import typing
 from pathlib import Path
+from typing import Optional
 from unittest.mock import MagicMock
 
 import pytest
@@ -491,6 +492,28 @@ def test_config_log_level(log_level: int) -> None:
     assert config.log_level == log_level
 
 
+@pytest.mark.parametrize("log_level", [None, 0, 5, 10, 20, 30, 40, 50])
+@pytest.mark.parametrize("uvicorn_logger_level", [0, 5, 10, 20, 30, 40, 50])
+def test_config_log_effective_level(
+    log_level: Optional[int], uvicorn_logger_level: Optional[int]
+) -> None:
+    default_level = 30
+    log_config = {
+        "version": 1,
+        "disable_existing_loggers": False,
+        "loggers": {
+            "uvicorn": {"level": uvicorn_logger_level},
+        },
+    }
+    config = Config(app=asgi_app, log_level=log_level, log_config=log_config)
+    config.load()
+
+    effective_level = log_level or uvicorn_logger_level or default_level
+    assert logging.getLogger("uvicorn.error").getEffectiveLevel() == effective_level
+    assert logging.getLogger("uvicorn.access").getEffectiveLevel() == effective_level
+    assert logging.getLogger("uvicorn.asgi").getEffectiveLevel() == effective_level
+
+
 def test_ws_max_size() -> None:
     config = Config(app=asgi_app, ws_max_size=1000)
     config.load()

uvicorn/config.py

@@ -504,7 +504,7 @@ def load(self) -> None:
         elif self.interface == "asgi2":
             self.loaded_app = ASGI2Middleware(self.loaded_app)
 
-        if logger.level <= TRACE_LOG_LEVEL:
+        if logger.getEffectiveLevel() <= TRACE_LOG_LEVEL:
             self.loaded_app = MessageLoggerMiddleware(self.loaded_app)
         if self.proxy_headers:
             self.loaded_app = ProxyHeadersMiddleware(