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

Correctly proxy exception in frontend_proxy worker #4723

Merged
merged 2 commits into from
Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/4723.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correctly proxy exception in frontend_proxy worker
15 changes: 10 additions & 5 deletions synapse/app/frontend_proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import synapse
from synapse import events
from synapse.api.errors import SynapseError
from synapse.api.errors import HttpResponseException, SynapseError
from synapse.app import _base
from synapse.config._base import ConfigError
from synapse.config.homeserver import HomeServerConfig
Expand Down Expand Up @@ -66,10 +66,15 @@ def on_GET(self, request, user_id):
headers = {
"Authorization": auth_headers,
}
result = yield self.http_client.get_json(
self.main_uri + request.uri.decode('ascii'),
headers=headers,
)

try:
result = yield self.http_client.get_json(
self.main_uri + request.uri.decode('ascii'),
headers=headers,
)
except HttpResponseException as e:
raise e.to_synapse_error()

defer.returnValue((200, result))

@defer.inlineCallbacks
Expand Down