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

Don't log stack trace when client has gone away during media download #4738

Merged
merged 3 commits into from
Feb 25, 2019
+10 −2
Merged

Don't log stack trace when client has gone away during media download #4738

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
442c88b
Don't log stack trace when client has gone away during media download
erikjohnston Feb 25, 2019
0fc0746
Newsfile
erikjohnston Feb 25, 2019
c0b0593
Fixup newsfile
erikjohnston Feb 25, 2019
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/4738.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cleanup request exception logging
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

full-stop?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nyargh

11 changes: 9 additions & 2 deletions synapse/rest/media/v1/_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,15 @@ def respond_with_responder(request, responder, media_type, file_size, upload_nam

logger.debug("Responding to media request with responder %s")
add_file_headers(request, media_type, file_size, upload_name)
with responder:
yield responder.write_to_consumer(request)
try:
with responder:
yield responder.write_to_consumer(request)
except Exception as e:
# The majority of the time this will be due to the client having gone
# away. Unfortunately, Twisted simply throws a generic exception at us
# in that case.
logger.warning("Failed to write to consumer: %s %s", type(e), e)

finish_request(request)


Expand Down