diff options
| author | David Robertson <davidr@element.io> | 2022-01-26 12:47:34 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 12:47:34 +0000 |
| commit | d8df8e6c1432d25ea1c0310a5f2dc48d1688345f (patch) | |
| tree | 43722b944a2ac3a5db89183cc8765495e302dd7e | |
| parent | Avoid type annotation problems in prom-client (#11834) (diff) | |
| download | synapse-d8df8e6c1432d25ea1c0310a5f2dc48d1688345f.tar.xz | |
Don't print HTTPStatus.* in "Processed..." logs (#11827)
* Don't print HTTPStatus.* in "Processed..." logs Fixes #11812. See also #7118 and https://github.com/matrix-org/synapse/pull/7188#r401719326 in particular. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
| -rw-r--r-- | changelog.d/11827.bugfix | 1 | ||||
| -rw-r--r-- | synapse/http/site.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/11827.bugfix b/changelog.d/11827.bugfix new file mode 100644 index 0000000000..30222dfb62 --- /dev/null +++ b/changelog.d/11827.bugfix @@ -0,0 +1 @@ +Fix a bug introduced in Synapse 0.33.3 causing requests to sometimes log strings such as `HTTPStatus.OK` instead of integer status codes. \ No newline at end of file diff --git a/synapse/http/site.py b/synapse/http/site.py index c180a1d323..40f6c04894 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -407,7 +407,10 @@ class SynapseRequest(Request): user_agent = get_request_user_agent(self, "-") - code = str(self.code) + # int(self.code) looks redundant, because self.code is already an int. + # But self.code might be an HTTPStatus (which inherits from int)---which has + # a different string representation. So ensure we really have an integer. + code = str(int(self.code)) if not self.finished: # we didn't send the full response before we gave up (presumably because # the connection dropped) |