summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 15:13:50 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 15:13:50 +0000
commit472734a8cc19d4e4b9f5e311b59f58a37142f8a2 (patch)
treea9d3e1b8a74968a0bacec1b0ae99638fbd223fe8
parentMake matrixfederationclient log more nicely (diff)
downloadsynapse-472734a8cc19d4e4b9f5e311b59f58a37142f8a2.tar.xz
Consume errors in time_bound_deferred
-rw-r--r--synapse/util/__init__.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py
index e77eba90ad..79109d0b19 100644
--- a/synapse/util/__init__.py
+++ b/synapse/util/__init__.py
@@ -99,8 +99,6 @@ class Clock(object):
             except:
                 pass
 
-            return res
-
         given_deferred.addCallbacks(callback=sucess, errback=err)
 
         timer = self.call_later(time_out, timed_out_fn)