summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 11:25:20 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 11:25:20 +0000
commit36e144091b3be995754f7100a9c5322b224f2692 (patch)
tree7f236bfe7d949e71c98bd781a63f184716a571bb /synapse/util
parentTemporarily add a run_on_reactor() call (diff)
downloadsynapse-36e144091b3be995754f7100a9c5322b224f2692.tar.xz
Remove spurious comma. Remove temp run_on_reactor
Diffstat (limited to 'synapse/util')
-rw-r--r--synapse/util/retryutils.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index ee1194f1de..ab58eb528b 100644
--- a/synapse/util/retryutils.py
+++ b/synapse/util/retryutils.py
@@ -54,7 +54,6 @@ def get_retry_limiter(destination, clock, store, **kwargs):
             # We aren't ready to retry that destination.
             raise
     """
-    yield run_on_reactor()
     retry_last_ts, retry_interval = (0, 0)
 
     retry_timings = yield store.get_destination_retry_timings(
@@ -149,7 +148,7 @@ class RetryDestinationLimiter(object):
             else:
                 self.retry_interval = self.min_retry_interval
 
-            retry_last_ts = int(self.clock.time_msec()),
+            retry_last_ts = int(self.clock.time_msec())
 
         self.store.set_destination_retry_timings(
             self.destination, retry_last_ts, self.retry_interval