summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/6139.misc1
-rw-r--r--changelog.d/6175.bugfix1
-rw-r--r--changelog.d/6175.misc1
-rw-r--r--synapse/rest/media/v1/_base.py2
4 files changed, 3 insertions, 2 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/changelog.d/6175.bugfix b/changelog.d/6175.bugfix deleted file mode 100644
index 3cd9a99edf..0000000000 --- a/changelog.d/6175.bugfix +++ /dev/null
@@ -1 +0,0 @@ -Fix syntax error in unique_user_filter_index schema update. diff --git a/changelog.d/6175.misc b/changelog.d/6175.misc new file mode 100644
index 0000000000..5bb24f02fc --- /dev/null +++ b/changelog.d/6175.misc
@@ -0,0 +1 @@ +Update `user_filters` table to have a unique index, and non-null columns. Thanks to @pik for contributing this 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: