summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-05-05 14:08:12 +0100
committerGitHub <noreply@github.com>2017-05-05 14:08:12 +0100
commit27c28eaa27c33f23aa2c05d4775f1bff53f2515c (patch)
treec7010dd2ae3e282e65b5cb6d320ca802a42cb85e /synapse/handlers/federation.py
parentMerge pull request #2189 from matrix-org/erikj/handle_remote_device_list (diff)
parentUse preserve_fn and add logs (diff)
downloadsynapse-27c28eaa27c33f23aa2c05d4775f1bff53f2515c.tar.xz
Merge pull request #2190 from matrix-org/erikj/mark_remote_as_back_more
Always mark remotes as up if we receive a signed request from them
Diffstat (limited to 'synapse/handlers/federation.py')
-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: