diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:34:51 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2014-12-08 19:34:51 +0000 |
| commit | 8529fba02d93ed1d0d08873f0cbbd58a3194e4af (patch) | |
| tree | a56b25904e85ac312619454df3251b95d158ea04 /synapse/handlers | |
| parent | add a write-through cache on the retry schedule (diff) | |
| download | synapse-8529fba02d93ed1d0d08873f0cbbd58a3194e4af.tar.xz | |
fix a million stupid bugs and make it actually work
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 7a79e2d117..cfb5029774 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -211,7 +211,8 @@ class FederationHandler(BaseHandler): # if we're receiving valid events from an origin, # it's probably a good idea to mark it as not in retry-state # for sending (although this is a bit of a leap) - if ((self.store.get_destination_retry_timings(origin))[0]): + retry_timings = yield self.store.get_destination_retry_timings(origin) + if (retry_timings and retry_timings.retry_last_ts): self.store.set_destination_retry_timings(origin, 0, 0) room = yield self.store.get_room(event.room_id) |