summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-02 17:07:32 +0100
committerGitHub <noreply@github.com>2016-08-02 17:07:32 +0100
commit06f812b95c4b644554a7386113ec2ac364ef47e9 (patch)
tree10c56da8a2bb2d46cc397d46eadf439738f88597 /synapse/federation
parentMerge pull request #940 from matrix-org/erikj/fed_state_cache (diff)
parentDon't double wrap 200 (diff)
downloadsynapse-06f812b95c4b644554a7386113ec2ac364ef47e9.tar.xz
Merge pull request #971 from matrix-org/erikj/fed_state
Fix response cache
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/federation_server.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index d15c7e1b40..612d274bdb 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -205,7 +205,7 @@ class FederationServer(FederationBase):
         result = self._state_resp_cache.get((room_id, event_id))
         if not result:
             with (yield self._server_linearizer.queue((origin, room_id))):
-                resp = yield self.response_cache.set(
+                resp = yield self._state_resp_cache.set(
                     (room_id, event_id),
                     self._on_context_state_request_compute(room_id, event_id)
                 )
@@ -235,10 +235,10 @@ class FederationServer(FederationBase):
                     )
                 )
 
-        defer.returnValue((200, {
+        defer.returnValue({
             "pdus": [pdu.get_pdu_json() for pdu in pdus],
             "auth_chain": [pdu.get_pdu_json() for pdu in auth_chain],
-        }))
+        })
 
     @defer.inlineCallbacks
     @log_function