Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

2023-07-20 11:08:14 +01:00 · 2023-07-20 11:08:14 +01:00 · d9fa426a54
parent 1ea1a0b251 fd44053b84
commit d9fa426a54
2 changed files with 1 additions and 4 deletions
--- a/changelog.d/15969.feature
+++ b/changelog.d/15969.feature
@ -0,0 +1 @@
+Allow configuring the set of workers to proxy outbound federation traffic through via `outbound_federation_restricted_to`.
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@ -327,10 +327,6 @@ class _AsyncResource(resource.Resource, metaclass=abc.ABCMeta):
            # of our stack, and thus gives us a sensible stack
            # trace.
            f = failure.Failure()
-            logger.exception(
-                "Error handling request",
-                exc_info=(f.type, f.value, f.getTracebackObject()),
-            )
            self._send_error_response(f, request)

    async def _async_render(
				`@ -0,0 +1 @@`
				Allow configuring the set of workers to proxy outbound federation traffic through via `outbound_federation_restricted_to`.