summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2019-10-07 15:41:25 +0100
committerAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-10-07 15:41:25 +0100
commitdc795ba709f2ffe41671d25d94f21d4b31a5301d (patch)
treeb77c2cef761bae3aa08289fa9144710f935a4cc1
parentFix changelog for PR #6175 (diff)
downloadsynapse-dc795ba709f2ffe41671d25d94f21d4b31a5301d.tar.xz
Log responder we are using. (#6139)
This prevents us logging "Responding to media request with responder %s".
-rw-r--r--changelog.d/6139.misc1
-rw-r--r--synapse/rest/media/v1/_base.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6139.misc b/changelog.d/6139.misc
new file mode 100644

index 0000000000..d4b65e7af8 --- /dev/null +++ b/changelog.d/6139.misc
@@ -0,0 +1 @@ +Log responder when responding to media request. diff --git a/synapse/rest/media/v1/_base.py b/synapse/rest/media/v1/_base.py
index 5fefee4dde..65bbf00073 100644 --- a/synapse/rest/media/v1/_base.py +++ b/synapse/rest/media/v1/_base.py
@@ -195,7 +195,7 @@ def respond_with_responder(request, responder, media_type, file_size, upload_nam respond_404(request) return - logger.debug("Responding to media request with responder %s") + logger.debug("Responding to media request with responder %s", responder) add_file_headers(request, media_type, file_size, upload_name) try: with responder: