diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-20 11:53:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 11:53:36 +0000 |
| commit | eddce9d74abce0e0e65d5292149933ed9bf6025a (patch) | |
| tree | b4db8fbbb01c3ee21724aa5eea4639c01ca23f5e /synapse/app/pusher.py | |
| parent | Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejections (diff) | |
| parent | Stop preserve_fn leaking context into the reactor (diff) | |
| download | synapse-eddce9d74abce0e0e65d5292149933ed9bf6025a.tar.xz | |
Merge pull request #2027 from matrix-org/rav/logcontext_leaks
A few fixes to logcontext things
Diffstat (limited to 'synapse/app/pusher.py')
| -rw-r--r-- | synapse/app/pusher.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py index b025db54d4..ab682e52ec 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py @@ -31,7 +31,8 @@ from synapse.storage.engines import create_engine from synapse.storage import DataStore from synapse.util.async import sleep from synapse.util.httpresourcetree import create_resource_tree -from synapse.util.logcontext import LoggingContext, preserve_fn +from synapse.util.logcontext import LoggingContext, preserve_fn, \ + PreserveLoggingContext from synapse.util.manhole import manhole from synapse.util.rlimit import change_resource_limit from synapse.util.versionstring import get_version_string @@ -275,7 +276,11 @@ def start(config_options): ps.start_listening(config.worker_listeners) def run(): - with LoggingContext("run"): + # make sure that we run the reactor with the sentinel log context, + # otherwise other PreserveLoggingContext instances will get confused + # and complain when they see the logcontext arbitrarily swapping + # between the sentinel and `run` logcontexts. + with PreserveLoggingContext(): logger.info("Running") change_resource_limit(config.soft_file_limit) if config.gc_thresholds: |