summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-10 10:35:57 +0000
committerErik Johnston <erik@matrix.org>2014-12-10 10:35:57 +0000
commit6497caee7c65cffd13508eb55313a011bc8b251e (patch)
tree88448566493c7bb6bef3d07e816b2597ffb46ba5 /synapse/handlers/federation.py
parentIgnore pycharm dir (diff)
parentturn back on per-request transaction retries, so that every time we try to hi... (diff)
downloadsynapse-6497caee7c65cffd13508eb55313a011bc8b251e.tar.xz
Merge pull request #22 from matrix-org/federation_retries
Federation retries
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 925eb5376e..cfb5029774 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -207,6 +207,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)