summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-01 14:41:16 +0100
committerErik Johnston <erik@matrix.org>2015-05-01 14:41:25 +0100
commit2d386d7038b6cd9792a26cd7e59c6279a790fbeb (patch)
tree8f685f258fbe0870590916d83f743249079dfb84 /synapse/handlers
parentRemove inlineCallbacks from non-generator (diff)
downloadsynapse-2d386d7038b6cd9792a26cd7e59c6279a790fbeb.tar.xz
That wasn't a deferred
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/_base.py4
-rw-r--r--synapse/handlers/federation.py2
2 files changed, 2 insertions, 4 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index dffb033fbd..4b3f4eadab 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -150,8 +150,6 @@ class BaseHandler(object):
 
         notify_d.addErrback(log_failure)
 
-        fed_d = federation_handler.handle_new_event(
+        federation_handler.handle_new_event(
             event, destinations=destinations,
         )
-
-        fed_d.addErrback(log_failure)
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index a14928cb85..85e2757227 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -87,7 +87,7 @@ class FederationHandler(BaseHandler):
             processing.
         """
 
-        self.replication_layer.send_pdu(event, destinations)
+        return self.replication_layer.send_pdu(event, destinations)
 
     @log_function
     @defer.inlineCallbacks