diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-19 11:12:33 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-19 11:12:33 +0100 |
| commit | 1ffb7bec2090df16b66bb803a8540e5f20b1649d (patch) | |
| tree | 8ffb1ee66a6a7008fb3cc8578f3ab1f3ed6c5af7 /synapse | |
| parent | Merge pull request #3556 from matrix-org/rav/background_processes (diff) | |
| parent | Merge pull request #3561 from matrix-org/rav/disable_logcontext_warning (diff) | |
| download | synapse-1ffb7bec2090df16b66bb803a8540e5f20b1649d.tar.xz | |
Merge remote-tracking branch 'origin/release-v0.33.0' into develop
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/_base.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 3cde33c0d7..6dc16f0808 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -17,4 +17,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.32.2" +__version__ = "0.33.0rc1" diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 98dde77431..a6a0e6ec9f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -343,9 +343,10 @@ class SQLBaseStore(object): """ parent_context = LoggingContext.current_context() if parent_context == LoggingContext.sentinel: - logger.warn( - "Running db txn from sentinel context: metrics will be lost", - ) + # warning disabled for 0.33.0 release; proper fixes will land imminently. + # logger.warn( + # "Running db txn from sentinel context: metrics will be lost", + # ) parent_context = None start_time = time.time() |