From 2d386d7038b6cd9792a26cd7e59c6279a790fbeb Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 1 May 2015 14:41:16 +0100 Subject: [PATCH] That wasn't a deferred --- synapse/handlers/_base.py | 4 +--- synapse/handlers/federation.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index dffb033fb..4b3f4eada 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 a14928cb8..85e275722 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