Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

E2eKeysHandler: minor tweaks 

PR feedback
This commit is contained in:
Richard van der Hoff 2016-08-03 14:24:33 +01:00
parent 921f17f938
commit a843868fe9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/e2e_keys.py
View File

@ -22,17 +22,15 @@ from twisted.internet import defer
from synapse.api import errors from synapse.api import errors
import synapse.types import synapse.types
from ._base import BaseHandler
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class E2eKeysHandler(BaseHandler): class E2eKeysHandler(object):
def __init__(self, hs): def __init__(self, hs):
super(E2eKeysHandler, self).__init__(hs)
self.store = hs.get_datastore() self.store = hs.get_datastore()
self.federation = hs.get_replication_layer() self.federation = hs.get_replication_layer()
self.is_mine_id = hs.is_mine_id self.is_mine_id = hs.is_mine_id
self.server_name = hs.hostname
# doesn't really work as part of the generic query API, because the # doesn't really work as part of the generic query API, because the
# query request requires an object POST, but we abuse the # query request requires an object POST, but we abuse the
@ -74,7 +72,7 @@ class E2eKeysHandler(BaseHandler):
# TODO: do these in parallel # TODO: do these in parallel
results = {} results = {}
for destination, destination_query in queries_by_domain.items(): for destination, destination_query in queries_by_domain.items():
if destination == self.hs.hostname: if destination == self.server_name:
res = yield self.query_local_devices(destination_query) res = yield self.query_local_devices(destination_query)
else: else:
res = yield self.federation.query_client_keys( res = yield self.federation.query_client_keys(