summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-10-02 16:42:28 +0100
committerGitHub <noreply@github.com>2018-10-02 16:42:28 +0100
commit25baf3b2ac44da0d51969d559d1b06124b17c286 (patch)
tree056923784b8c55f64d9c23ed2e99070e7eea1b67 /synapse
parentRemove Jenkins & other old dev junk (#3988) (diff)
parentAdd tests (diff)
downloadsynapse-25baf3b2ac44da0d51969d559d1b06124b17c286.tar.xz
Merge pull request #3991 from matrix-org/erikj/fix_pop_retry_cache
Fix bug when invalidating destination retry timings
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/transactions.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index ab54977a75..a3032cdce9 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -216,7 +216,7 @@ class TransactionStore(SQLBaseStore):
             retry_interval (int) - how long until next retry in ms
         """
 
-        self._destination_retry_cache.pop(destination)
+        self._destination_retry_cache.pop(destination, None)
         return self.runInteraction(
             "set_destination_retry_timings",
             self._set_destination_retry_timings,