summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-03-23 00:17:46 +0000
committerRichard van der Hoff <richard@matrix.org>2017-03-23 00:17:46 +0000
commit19b9366d73585e815e59e7a6d07d6e307af5e0fb (patch)
treef31d28d9d9de7eb218037277624463cd5e9d08ed /synapse/util
parentMerge pull request #2044 from matrix-org/rav/crypto_docs (diff)
downloadsynapse-19b9366d73585e815e59e7a6d07d6e307af5e0fb.tar.xz
Fix a couple of logcontext leaks
Use preserve_fn to correctly manage the logcontexts around things we don't want
to yield on.
Diffstat (limited to '')
-rw-r--r--synapse/util/retryutils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py
index 153ef001ad..b68e8c4e9f 100644
--- a/synapse/util/retryutils.py
+++ b/synapse/util/retryutils.py
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+import synapse.util.logcontext
 from twisted.internet import defer
 
 from synapse.api.errors import CodeMessageException
@@ -173,4 +173,5 @@ class RetryDestinationLimiter(object):
                     "Failed to store set_destination_retry_timings",
                 )
 
-        store_retry_timings()
+        # we deliberately do this in the background.
+        synapse.util.logcontext.preserve_fn(store_retry_timings)()