diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-09-23 14:31:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 14:31:47 +0100 |
| commit | 0660f8e3670f6a00a063699a76fc94112174cb07 (patch) | |
| tree | 0712596399c558e9adb6e75f04eea83f334e312e | |
| parent | fix broken copyrights (diff) | |
| parent | Fix exception when resetting retry timings (diff) | |
| download | synapse-0660f8e3670f6a00a063699a76fc94112174cb07.tar.xz | |
Merge pull request #6072 from matrix-org/rav/fix_retry_reset
Fix exception when resetting retry timings
| -rw-r--r-- | changelog.d/6072.misc | 1 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6072.misc b/changelog.d/6072.misc new file mode 100644 index 0000000000..91cf164714 --- /dev/null +++ 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 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) |