summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-05 11:14:09 +0100
committerErik Johnston <erik@matrix.org>2017-05-05 11:14:09 +0100
commit7b222fc56e9854d1f8f084d996d9ca694e91dd6c (patch)
tree82fc53a596916c3c326dcfeaa717d7c46c8ed473 /synapse
parentAlways mark remotes as up if we receive a signed request from them (diff)
downloadsynapse-7b222fc56e9854d1f8f084d996d9ca694e91dd6c.tar.xz
Remove redundant reset of destination timers
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py7
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: