From ff8cde5fbb47077d56e65259901e9b7b1c3295d0 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 22 May 2020 23:31:31 +0100
Subject: [PATCH] Fix incorrect exception handling in KeyUploadServlet.on_POST

Introduced in #7556
---
 changelog.d/7563.misc         | 1 +
 synapse/app/generic_worker.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/7563.misc

diff --git a/changelog.d/7563.misc b/changelog.d/7563.misc
new file mode 100644
index 000000000000..ed271f9de883
--- /dev/null
+++ b/changelog.d/7563.misc
@@ -0,0 +1 @@
+Stop logging some expected HTTP request errors as exceptions.
diff --git a/synapse/app/generic_worker.py b/synapse/app/generic_worker.py
index 2906b93f6a74..58f993afe6b5 100644
--- a/synapse/app/generic_worker.py
+++ b/synapse/app/generic_worker.py
@@ -214,7 +214,7 @@ async def on_POST(self, request, device_id):
                     self.main_uri + request.uri.decode("ascii"), body, headers=headers
                 )
             except HttpResponseException as e:
-                raise e.to_synapse() from e
+                raise e.to_synapse_error() from e
             except RequestSendFailed as e:
                 raise SynapseError(502, "Failed to talk to master") from e