diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-10 13:47:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-10 13:47:50 +0100 |
commit | 933034e2feaae56640e4bbb7f58c85e4bbf720c9 (patch) | |
tree | a23b9fa75cfb4c2d754c785a2ef0ab1660d2e6dc /synapse/__init__.py | |
parent | Add domain validation when creating room with list of invitees (#6121) (diff) | |
parent | Fixup comments (diff) | |
download | synapse-933034e2feaae56640e4bbb7f58c85e4bbf720c9.tar.xz |
Merge pull request #6127 from matrix-org/erikj/patch_inner
Add more log context checks when patching inlineCallbacks
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r-- | synapse/__init__.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 2d52d26af5..56df3f5ac6 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -17,6 +17,7 @@ """ This is a reference implementation of a Matrix home server. """ +import os import sys # Check that we're not running on an unsupported Python version. @@ -36,3 +37,10 @@ except ImportError: pass __version__ = "1.4.0" + +if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): + # We import here so that we don't have to install a bunch of deps when + # running the packaging tox test. + from synapse.util.patch_inline_callbacks import do_patch + + do_patch() |