diff options
| author | Erik Johnston <erikj@jki.re> | 2016-11-23 15:39:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 15:39:12 +0000 |
| commit | 302fbd218ddb00a1d38e778b29cdf043800941e1 (patch) | |
| tree | 89e462d2fc8d2470bb66d744e2289050df7edef3 /synapse/util/retryutils.py | |
| parent | Merge pull request #1641 from matrix-org/erikj/as_pushers (diff) | |
| parent | Shuffle receipt handler around so that worker apps don't need to load it (diff) | |
| download | synapse-302fbd218ddb00a1d38e778b29cdf043800941e1.tar.xz | |
Merge pull request #1635 from matrix-org/erikj/split_out_fed_txn
Split out federation transaction sending to a worker
Diffstat (limited to 'synapse/util/retryutils.py')
| -rw-r--r-- | synapse/util/retryutils.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py index 49527f4d21..46ef5a8ec7 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py @@ -121,12 +121,6 @@ class RetryDestinationLimiter(object): pass def __exit__(self, exc_type, exc_val, exc_tb): - def err(failure): - logger.exception( - "Failed to store set_destination_retry_timings", - failure.value - ) - valid_err_code = False if exc_type is not None and issubclass(exc_type, CodeMessageException): valid_err_code = 0 <= exc_val.code < 500 @@ -151,6 +145,15 @@ class RetryDestinationLimiter(object): retry_last_ts = int(self.clock.time_msec()) - self.store.set_destination_retry_timings( - self.destination, retry_last_ts, self.retry_interval - ).addErrback(err) + @defer.inlineCallbacks + def store_retry_timings(): + try: + yield self.store.set_destination_retry_timings( + self.destination, retry_last_ts, self.retry_interval + ) + except: + logger.exception( + "Failed to store set_destination_retry_timings", + ) + + store_retry_timings() |