OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Fix exception when resetting retry timings
pull/6000/head
Richard van der Hoff 2019-09-23 14:31:47 +01:00 committed by GitHub
parent 7ef319aefe 9d94313209
commit 0660f8e367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6072.misc Normal file
View File

@ -0,0 +1 @@
Add a 'failure_ts' column to the 'destinations' database table.

2
synapse/federation/transport/server.py
View File

@ -165,7 +165,7 @@ class Authenticator(object):
async def _reset_retry_timings(self, origin): async def _reset_retry_timings(self, origin):
try: try:
logger.info("Marking origin %r as up", origin) 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: except Exception:
logger.exception("Error resetting retry timings on %s", origin) logger.exception("Error resetting retry timings on %s", origin)