diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-05 13:41:19 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-05 13:41:19 +0100 |
| commit | 310b1ccdc1e80164811d4b1287c0a504d0a33c77 (patch) | |
| tree | e5c8a86859549c5d715bb0fdea914062a7cfa1e1 /synapse/federation | |
| parent | Remove redundant reset of destination timers (diff) | |
| download | synapse-310b1ccdc1e80164811d4b1287c0a504d0a33c77.tar.xz | |
Use preserve_fn and add logs
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/transport/server.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 828dcd01a7..3d676e7d8b 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -24,6 +24,7 @@ from synapse.http.servlet import ( ) from synapse.util.ratelimitutils import FederationRateLimiter from synapse.util.versionstring import get_version_string +from synapse.util.logcontext import preserve_fn from synapse.types import ThirdPartyInstanceID import functools @@ -143,7 +144,8 @@ class Authenticator(object): # alive retry_timings = yield self.store.get_destination_retry_timings(origin) if retry_timings and retry_timings["retry_last_ts"]: - self.store.set_destination_retry_timings(origin, 0, 0) + logger.info("Marking origin %r as up", origin) + preserve_fn(self.store.set_destination_retry_timings)(origin, 0, 0) defer.returnValue(origin) |