diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
| commit | ac08316548cf02c5991d455e96915959af603e0e (patch) | |
| tree | 6d4028791cc5656b90be063abdc2f7b2e73f68f4 /synapse/handlers/federation.py | |
| parent | Bump version and changelog (diff) | |
| parent | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts (diff) | |
| download | synapse-ac08316548cf02c5991d455e96915959af603e0e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 2af9849ed0..52d97dfbf3 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -380,13 +380,6 @@ class FederationHandler(BaseHandler): 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) if not room: |