diff options
author | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:17:46 +0000 |
commit | 23465a30b65808a75afa5cb98bcd1131a2a2c984 (patch) | |
tree | dcd987034fefbb2649da8346bf36c9d9ded25acc /synapse/util/logcontext.py | |
parent | Merge branch 'http_client_refactor' into pushers (diff) | |
parent | Fix pep8 codestyle warnings (diff) | |
download | synapse-23465a30b65808a75afa5cb98bcd1131a2a2c984.tar.xz |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/util/logcontext.py')
-rw-r--r-- | synapse/util/logcontext.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py index 2f430a0f19..23b3decb45 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -1,6 +1,8 @@ import threading import logging +logger = logging.getLogger(__name__) + class LoggingContext(object): """Additional context for log formatting. Contexts are scoped within a @@ -53,7 +55,7 @@ class LoggingContext(object): None to avoid suppressing any exeptions that were thrown. """ if self.thread_local.current_context is not self: - logging.error( + logger.error( "Current logging context %s is not the expected context %s", self.thread_local.current_context, self |