Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stupid syntax thinkos

This commit is contained in:
Matthew Hodgson 2014-12-07 23:44:16 +00:00
parent aed62a3583
commit 5cd43d4b9f
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
synapse/federation/replication.py
View File

@ -866,7 +866,7 @@ class _TransactionQueue(object):
if code == 200:
deferred.callback(None)
else:
start_retrying(destination, retry_interval)
self.start_retrying(destination, retry_interval)
deferred.errback(RuntimeError("Got status %d" % code))
# Ensures we don't continue until all callbacks on that
@ -883,7 +883,7 @@ class _TransactionQueue(object):
# for this finishing functions deferred.
logger.exception("TX [%s] Problem in _attempt_transaction: %s", destination, e)
start_retrying(destination, retry_interval)
self.start_retrying(destination, retry_interval)
for deferred in deferreds:
if not deferred.called:
@ -896,7 +896,7 @@ class _TransactionQueue(object):
# Check to see if there is anything else to send.
self._attempt_new_transaction(destination)
def start_retrying(destination, retry_interval):
def start_retrying(self, destination, retry_interval):
# track that this destination is having problems and we should
# give it a chance to recover before trying it again
if retry_interval:
@ -905,4 +905,3 @@ def start_retrying(destination, retry_interval):
retry_interval = 2 # try again at first after 2 seconds
self.store.set_destination_retry_timings(destination,
int(self._clock.time_msec()), retry_interval)

2
synapse/storage/transactions.py
View File

@ -230,7 +230,7 @@ class TransactionStore(SQLBaseStore):
else:
return None
def set_destination_retry_timings(self, destination):
def set_destination_retry_timings(self, destination, retry_last_ts, retry_interval):
"""Sets the current retry timings for a given destination.
Both timings should be zero if retrying is no longer occuring.