Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle HttpResponseException when using federation client.

Browse Source 
Otherwise we just log exceptions everywhere.
This commit is contained in:
Erik Johnston 2019-06-07 10:29:35 +01:00
parent 4f581faa98
commit a46ef1e3a4
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/groups/attestations.py
View File

@ -42,7 +42,7 @@ from signedjson.sign import sign_json
from twisted.internet import defer from twisted.internet import defer
from synapse.api.errors import RequestSendFailed, SynapseError from synapse.api.errors import HttpResponseException, RequestSendFailed, SynapseError
from synapse.metrics.background_process_metrics import run_as_background_process from synapse.metrics.background_process_metrics import run_as_background_process
from synapse.types import get_domain_from_id from synapse.types import get_domain_from_id
from synapse.util.logcontext import run_in_background from synapse.util.logcontext import run_in_background
@ -194,7 +194,7 @@ class GroupAttestionRenewer(object):
yield self.store.update_attestation_renewal( yield self.store.update_attestation_renewal(
group_id, user_id, attestation group_id, user_id, attestation
) )
except RequestSendFailed as e: except (RequestSendFailed, HttpResponseException) as e:
logger.warning( logger.warning(
"Failed to renew attestation of %r in %r: %s", "Failed to renew attestation of %r in %r: %s",
user_id, group_id, e, user_id, group_id, e,

2
synapse/handlers/groups_local.py
View File

@ -49,9 +49,7 @@ def _create_rerouter(func_name):
def http_response_errback(failure): def http_response_errback(failure):
failure.trap(HttpResponseException) failure.trap(HttpResponseException)
e = failure.value e = failure.value
if e.code == 403:
raise e.to_synapse_error() raise e.to_synapse_error()
return failure
def request_failed_errback(failure): def request_failed_errback(failure):
failure.trap(RequestSendFailed) failure.trap(RequestSendFailed)

29
synapse/handlers/profile.py
View File

@ -15,12 +15,15 @@
import logging import logging
from six import raise_from
from twisted.internet import defer from twisted.internet import defer
from synapse.api.errors import ( from synapse.api.errors import (
AuthError, AuthError,
CodeMessageException,
Codes, Codes,
HttpResponseException,
RequestSendFailed,
StoreError, StoreError,
SynapseError, SynapseError,
) )
@ -85,10 +88,10 @@ class BaseProfileHandler(BaseHandler):
ignore_backoff=True, ignore_backoff=True,
) )
defer.returnValue(result) defer.returnValue(result)
except CodeMessageException as e: except RequestSendFailed as e:
if e.code != 404: raise_from(SynapseError(502, "Failed to fetch profile"), e)
logger.exception("Failed to get displayname") except HttpResponseException as e:
raise raise e.to_synapse_error()
@defer.inlineCallbacks @defer.inlineCallbacks
def get_profile_from_cache(self, user_id): def get_profile_from_cache(self, user_id):
@ -142,10 +145,10 @@ class BaseProfileHandler(BaseHandler):
}, },
ignore_backoff=True, ignore_backoff=True,
) )
except CodeMessageException as e: except RequestSendFailed as e:
if e.code != 404: raise_from(SynapseError(502, "Failed to fetch profile"), e)
logger.exception("Failed to get displayname") except HttpResponseException as e:
raise raise e.to_synapse_error()
defer.returnValue(result["displayname"]) defer.returnValue(result["displayname"])
@ -208,10 +211,10 @@ class BaseProfileHandler(BaseHandler):
}, },
ignore_backoff=True, ignore_backoff=True,
) )
except CodeMessageException as e: except RequestSendFailed as e:
if e.code != 404: raise_from(SynapseError(502, "Failed to fetch profile"), e)
logger.exception("Failed to get avatar_url") except HttpResponseException as e:
raise raise e.to_synapse_error()
defer.returnValue(result["avatar_url"]) defer.returnValue(result["avatar_url"])