summary refs log tree commit diff
path: root/synapse/logging/scopecontextmanager.py
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-07-23 13:31:16 +0100
committerGitHub <noreply@github.com>2019-07-23 13:31:16 +0100
commit18a466b84e52b6e8c51a878e612d86410d6af680 (patch)
treeaa4901d9fe7ea8fa437717c0a115101beb0cc8f4 /synapse/logging/scopecontextmanager.py
parentMerge pull request #5732 from matrix-org/erikj/sdnotify (diff)
downloadsynapse-18a466b84e52b6e8c51a878e612d86410d6af680.tar.xz
Opentracing Utils (#5722)
* Add decerators for tracing functions

* Use the new clean contexts

* Context and edu utils

* Move opentracing setters

* Move whitelisting

* Sectioning comments

* Better args wrapper

* Docstrings

Co-Authored-By: Erik Johnston <erik@matrix.org>

* Remove unused methods.

* Don't use global

* One tracing decorator to rule them all.
Diffstat (limited to 'synapse/logging/scopecontextmanager.py')
-rw-r--r--synapse/logging/scopecontextmanager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/logging/scopecontextmanager.py b/synapse/logging/scopecontextmanager.py
index 8c661302c9..4eed4f2338 100644
--- a/synapse/logging/scopecontextmanager.py
+++ b/synapse/logging/scopecontextmanager.py
@@ -131,7 +131,7 @@ class _LogContextScope(Scope):
 
     def close(self):
         if self.manager.active is not self:
-            logger.error("Tried to close a none active scope!")
+            logger.error("Tried to close a non-active scope!")
             return
 
         if self._finish_on_close: