Don't print HTTPStatus.* in "Processed..." logs (#11827)

* Don't print HTTPStatus.* in "Processed..." logs Fixes #11812. See also #7118 and #7188 (comment) in particular. Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
matrix-org · Jan 26, 2022 · d8df8e6 · d8df8e6
1 parent c581556
commit d8df8e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/11827.bugfix 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.
diff --git a/synapse/http/site.py b/synapse/http/site.py
@@ -407,7 +407,10 @@ def _finished_processing(self) -> None:
 
         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)