Merge pull request #6072 from matrix-org/rav/fix_retry_reset

Fix exception when resetting retry timings
matrix-org · Sep 23, 2019 · 0660f8e · 0660f8e
2 parents 7ef319a + 9d94313
commit 0660f8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/6072.misc b/changelog.d/6072.misc
@@ -0,0 +1 @@
+Add a 'failure_ts' column to the 'destinations' database table.
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
@@ -165,7 +165,7 @@ async def authenticate_request(self, request, content):
     async def _reset_retry_timings(self, origin):
         try:
             logger.info("Marking origin %r as up", origin)
-            await self.store.set_destination_retry_timings(origin, 0, 0)
+            await self.store.set_destination_retry_timings(origin, None, 0, 0)
         except Exception:
             logger.exception("Error resetting retry timings on %s", origin)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add a 'failure_ts' column to the 'destinations' database table.