summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-12-08 00:17:12 +0000
committerMatthew Hodgson <matthew@matrix.org>2014-12-08 00:17:12 +0000
commit9c43b258ecc493b126ef2858b9bb8fda0f01478a (patch)
treef277d0ee5cacef5c43b94934e5817121cd37789d /synapse/handlers/federation.py
parentfix stupid syntax thinkos (diff)
downloadsynapse-9c43b258ecc493b126ef2858b9bb8fda0f01478a.tar.xz
actually reset retry schedule if we can successfuly talk to it
Diffstat (limited to '')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 925eb5376e..7a79e2d117 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -207,6 +207,12 @@ 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)
+        if ((self.store.get_destination_retry_timings(origin))[0]):
+            self.store.set_destination_retry_timings(origin, 0, 0)
 
         room = yield self.store.get_room(event.room_id)