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

matrix-org · Feb 25, 2020 · c1700df · c1700df
2 parents 89c6910 + 0660f8e
commit c1700df
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
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/config/repository.py b/synapse/config/repository.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2014, 2015 matrix.org
+# Copyright 2014, 2015 OpenMarket Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/synapse/config/workers.py b/synapse/config/workers.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2016 matrix.org
+# Copyright 2016 OpenMarket Ltd
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

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)