diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-03 13:51:25 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-03 13:52:27 +0000 |
| commit | d4f72a5bfb95d07d5af3f49c736823840659101a (patch) | |
| tree | 3f416fc10ee4fa5d24aae454a3b089fcc99fe6a5 /synapse/util | |
| parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
| download | synapse-d4f72a5bfb95d07d5af3f49c736823840659101a.tar.xz | |
Allowing tagging log contexts
Diffstat (limited to 'synapse/util')
| -rw-r--r-- | synapse/util/logcontext.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py index 0595c0fa4f..e701092cd8 100644 --- a/synapse/util/logcontext.py +++ b/synapse/util/logcontext.py @@ -47,7 +47,8 @@ class LoggingContext(object): """ __slots__ = [ - "parent_context", "name", "usage_start", "usage_end", "main_thread", "__dict__" + "parent_context", "name", "usage_start", "usage_end", "main_thread", + "__dict__", "tag", ] thread_local = threading.local() @@ -72,6 +73,9 @@ class LoggingContext(object): def add_database_transaction(self, duration_ms): pass + def __nonzero__(self): + return False + sentinel = Sentinel() def __init__(self, name=None): @@ -83,6 +87,7 @@ class LoggingContext(object): self.db_txn_duration = 0. self.usage_start = None self.main_thread = threading.current_thread() + self.tag = "" def __str__(self): return "%s@%x" % (self.name, id(self)) |