summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-10 14:38:21 +0100
committerErik Johnston <erik@matrix.org>2019-10-10 14:38:21 +0100
commit9d06fb9cb105b33762a55b1d385da81c84507f71 (patch)
tree36e42e7b0b32c3ce7358a022a6fcabef0c39a5a5 /synapse/__init__.py
parentNewsfile (diff)
parentMerge pull request #6191 from matrix-org/rav/fix_packaging (diff)
downloadsynapse-9d06fb9cb105b33762a55b1d385da81c84507f71.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/postgres_any
Diffstat (limited to 'synapse/__init__.py')
-rw-r--r--synapse/__init__.py8
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()