summary refs log tree commit diff
path: root/synapse/util/logcontext.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2018-01-17 13:52:42 +0000
committerGitHub <noreply@github.com>2018-01-17 13:52:42 +0000
commitfb6563b4be1df676128ca8ac7e9a35a094fcb0ee (patch)
tree1e719b80156074ec92466396fd8072e9c845d586 /synapse/util/logcontext.py
parentMerge pull request #2796 from matrix-org/rav/fix_closed_connection_errors (diff)
parentMerge branch 'develop' into rav/db_txn_time_in_millis (diff)
downloadsynapse-fb6563b4be1df676128ca8ac7e9a35a094fcb0ee.tar.xz
Merge pull request #2793 from matrix-org/rav/db_txn_time_in_millis
Track db txn time in millisecs
Diffstat (limited to 'synapse/util/logcontext.py')
-rw-r--r--synapse/util/logcontext.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/util/logcontext.py b/synapse/util/logcontext.py
index ca71a1fc27..a78e53812f 100644
--- a/synapse/util/logcontext.py
+++ b/synapse/util/logcontext.py
@@ -59,7 +59,7 @@ class LoggingContext(object):
 
     __slots__ = [
         "previous_context", "name", "ru_stime", "ru_utime",
-        "db_txn_count", "db_txn_duration", "usage_start", "usage_end",
+        "db_txn_count", "db_txn_duration_ms", "usage_start", "usage_end",
         "main_thread", "alive",
         "request", "tag",
     ]
@@ -97,7 +97,10 @@ class LoggingContext(object):
         self.ru_stime = 0.
         self.ru_utime = 0.
         self.db_txn_count = 0
-        self.db_txn_duration = 0.
+
+        # ms spent waiting for db txns, excluding scheduling time
+        self.db_txn_duration_ms = 0
+
         self.usage_start = None
         self.usage_end = None
         self.main_thread = threading.current_thread()
@@ -205,7 +208,7 @@ class LoggingContext(object):
 
     def add_database_transaction(self, duration_ms):
         self.db_txn_count += 1
-        self.db_txn_duration += duration_ms / 1000.
+        self.db_txn_duration_ms += duration_ms
 
 
 class LoggingContextFilter(logging.Filter):