summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 13:24:13 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 13:24:13 +0000
commitc82e26ad4ba80742adc68a7e8c52441d760e4746 (patch)
tree3366ee0d9b9ba410637dc7c1e10740a9a11f2ec0
parentHandle recieving failures in transactions (diff)
downloadsynapse-c82e26ad4ba80742adc68a7e8c52441d760e4746.tar.xz
Actually respond with JSON to incoming transaction
-rw-r--r--synapse/federation/federation_server.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 34f5b17446..c48a41b5d5 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -147,6 +147,8 @@ class FederationServer(FederationBase):
 
         logger.debug("Returning: %s", str(ret))
 
+        response = ret
+
         yield self.transaction_actions.set_response(
             transaction,
             200, response