diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-10 13:18:40 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-10 13:18:40 +0000 |
| commit | aae8a37e63662681f6e75cca5b32cfba78b0d74f (patch) | |
| tree | 10aa25caddf01da913d270186fc1169deff17320 /synapse/handlers | |
| parent | Fix AttributeError (diff) | |
| parent | update codestyle based on debate on #matrix-dev (diff) | |
| download | synapse-aae8a37e63662681f6e75cca5b32cfba78b0d74f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
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 f38d9a48c8..e5deb8a9ef 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -203,6 +203,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) |