Matrix/synapse
Matrix/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse synced 2024-07-15 10:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

E2E key query: handle federation fails

Browse source 
Don't fail the whole request if we can't connect to a particular server.
This commit is contained in:
Richard van der Hoff 2016-12-09 18:31:01 +00:00
parent 0d81e26769
commit efa4ccfaee
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
synapse/handlers/e2e_keys.py
View file

@ -16,6 +16,7 @@
import ujson as json
import logging
import twisted.internet.error
from canonicaljson import encode_canonical_json
from twisted.internet import defer
@ -111,6 +112,11 @@ class E2eKeysHandler(object):
failures[destination] = {
"status": 503, "message": "Not ready for retry",
}
except Exception as e:
# include ConnectionRefused and other errors
failures[destination] = {
"status": 503, "message": e.message
}
yield preserve_context_over_deferred(defer.gatherResults([
preserve_fn(do_remote_query)(destination)
@ -222,6 +228,11 @@ class E2eKeysHandler(object):
failures[destination] = {
"status": 503, "message": "Not ready for retry",
}
except Exception as e:
# include ConnectionRefused and other errors
failures[destination] = {
"status": 503, "message": e.message
}
yield preserve_context_over_deferred(defer.gatherResults([
preserve_fn(claim_client_keys)(destination)