diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-10 16:55:06 +0000 |
| commit | 4f37c0ea9dd99b76258d07059e5f2dc6549f3f95 (patch) | |
| tree | 3130a9b275d0f77c04118d54334ca3d4a9b7d71d /synapse/handlers | |
| parent | update media repository implementation docs (diff) | |
| parent | oops (diff) | |
| download | synapse-4f37c0ea9dd99b76258d07059e5f2dc6549f3f95.tar.xz | |
Merge branch 'develop' into media_repository
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 925eb5376e..cfb5029774 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -207,6 +207,13 @@ class FederationHandler(BaseHandler): e.msg, affected=event.event_id, ) + + # 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) + 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) |