diff options
author | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-12-07 14:24:01 +0000 |
commit | d8a6c734fa1ab6681431c43885ced627e5e672e0 (patch) | |
tree | 4ba6a510997e38e829c6a6b0aa53caace4e7b872 /docs/log_contexts.rst | |
parent | Copy dict in update_membership too (diff) | |
parent | Merge pull request #2723 from matrix-org/matthew/search-all-local-users (diff) | |
download | synapse-d8a6c734fa1ab6681431c43885ced627e5e672e0.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Diffstat (limited to 'docs/log_contexts.rst')
-rw-r--r-- | docs/log_contexts.rst | 4 |
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 ---------------------------------------------------- |