diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-04 08:28:56 +0000 |
| commit | fad3a8433535d7de321350bbd17373138c6fd3ec (patch) | |
| tree | 70fe66754b86a7a6b1466030dcc8d7e260063f4d /synapse/federation/federation_server.py | |
| parent | Bump version and changelog (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-fad3a8433535d7de321350bbd17373138c6fd3ec.tar.xz | |
Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 1fee4e83a6..e922b7ff4a 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -52,8 +52,8 @@ class FederationServer(FederationBase): self.auth = hs.get_auth() - self._room_pdu_linearizer = Linearizer() - self._server_linearizer = Linearizer() + self._room_pdu_linearizer = Linearizer("fed_room_pdu") + self._server_linearizer = Linearizer("fed_server") # We cache responses to state queries, as they take a while and often # come in waves. @@ -416,6 +416,9 @@ class FederationServer(FederationBase): def on_query_client_keys(self, origin, content): return self.on_query_request("client_keys", content) + def on_query_user_devices(self, origin, user_id): + return self.on_query_request("user_devices", user_id) + @defer.inlineCallbacks @log_function def on_claim_client_keys(self, origin, content): |