Skip to content

Commit a9e88cf

Browse files
feat(logs): make gunicorn logs structured (#17595)
* feat(logs): make gunicorn logs structured * tests: adjust logging tests --------- Co-authored-by: Ee Durbin <[email protected]>
1 parent fb3ef43 commit a9e88cf

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

tests/unit/test_logging.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,24 @@ def test_includeme(monkeypatch, settings, expected_level):
101101
"formatter": "structlog",
102102
},
103103
},
104-
"loggers": {"datadog.dogstatsd": {"level": "ERROR"}},
104+
"loggers": {
105+
"datadog.dogstatsd": {"level": "ERROR"},
106+
"gunicorn": {
107+
"propagate": False,
108+
"handlers": ["primary"],
109+
"level": expected_level,
110+
},
111+
"gunicorn.access": {
112+
"propagate": False,
113+
"handlers": ["primary"],
114+
"level": expected_level,
115+
},
116+
"gunicorn.server": {
117+
"propagate": False,
118+
"handlers": ["primary"],
119+
"level": expected_level,
120+
},
121+
},
105122
"root": {"level": expected_level, "handlers": ["primary"]},
106123
}
107124
)

warehouse/logging.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,24 @@ def includeme(config):
6666
"formatter": "structlog",
6767
},
6868
},
69-
"loggers": {"datadog.dogstatsd": {"level": "ERROR"}},
69+
"loggers": {
70+
"datadog.dogstatsd": {"level": "ERROR"},
71+
"gunicorn": {
72+
"propagate": False,
73+
"handlers": ["primary"],
74+
"level": config.registry.settings.get("logging.level", "INFO"),
75+
},
76+
"gunicorn.access": {
77+
"propagate": False,
78+
"handlers": ["primary"],
79+
"level": config.registry.settings.get("logging.level", "INFO"),
80+
},
81+
"gunicorn.server": {
82+
"propagate": False,
83+
"handlers": ["primary"],
84+
"level": config.registry.settings.get("logging.level", "INFO"),
85+
},
86+
},
7087
"root": {
7188
"level": config.registry.settings.get("logging.level", "INFO"),
7289
"handlers": ["primary"],

0 commit comments

Comments
 (0)