kaslo/synapse
1
0
Fork 0
Code Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Morgan
2020-02-25 15:21:05 +00:00
parent 89c6910adb 0660f8e367
commit c1700df2d7
4 changed files with 4 additions and 3 deletions
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/config/repository.py
View File

@@ -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.

2
synapse/config/workers.py
View File

@@ -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.

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

@@ -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)