summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-11-15 11:13:53 +0000
committerGitHub <noreply@github.com>2017-11-15 11:13:53 +0000
commit1b83c09c034dfbe35b462404da0aca071ae1f65e (patch)
tree9020d3f64ad16f8c25b318653b702e91ae34d80b /docs
parentMerge pull request #2650 from matrix-org/dbkr/push_include_content_option (diff)
parentRemove __PreservingContextDeferred too (diff)
downloadsynapse-1b83c09c034dfbe35b462404da0aca071ae1f65e.tar.xz
Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs
Remove preserve_context_over_{fn, deferred}
Diffstat (limited to 'docs')
-rw-r--r--docs/log_contexts.rst4
1 files changed, 0 insertions, 4 deletions
diff --git a/docs/log_contexts.rst b/docs/log_contexts.rst
index eb1784e700..b19b7fa1ea 100644
--- a/docs/log_contexts.rst
+++ b/docs/log_contexts.rst
@@ -298,10 +298,6 @@ It can be used like this:
         # this will now be logged against the request context
         logger.debug("Request handling complete")
 
-XXX: I think ``preserve_context_over_fn`` is supposed to do the first option,
-but the fact that it does ``preserve_context_over_deferred`` on its results
-means that its use is fraught with difficulty.
-
 Passing synapse deferreds into third-party functions
 ----------------------------------------------------