diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-24 12:57:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-24 12:57:32 +0100 |
| commit | ed8b92f0d22b9de96c5ac04ef8ef45531fe45a2c (patch) | |
| tree | c6c35d841e75d73ed2a045d30d8abc87487a57ab /synapse/federation | |
| parent | Merge commit '33757bad1' into rav/saml_mapping_work (diff) | |
| parent | Add submit_url response parameter to msisdn /requestToken (#6079) (diff) | |
| download | synapse-ed8b92f0d22b9de96c5ac04ef8ef45531fe45a2c.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/saml_mapping_work
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 7dc696c7ae..7f8a16e355 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -165,7 +165,7 @@ class Authenticator(object): 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) |