Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

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

Merged
merged 4 commits into from
Jan 26, 2022
+5 −1
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2c4650
Don't print HTTPStatus.* in "Processed..." logs
Jan 25, 2022
963b122
Changelog
Jan 25, 2022
543fa53
Update changelog.d/11827.bugfix
Jan 26, 2022
f46a8a1
Merge remote-tracking branch 'origin/develop' into dmr/status-as-int-…
Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/11827.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ensure we always log HTTP status codes as integers instead of e.g. `HTTPStatus.OK`.
DMRobertson marked this conversation as resolved.
Show resolved Hide resolved
5 changes: 4 additions & 1 deletion synapse/http/site.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down