summary refs log tree commit diff
path: root/synapse/http/server.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/http/server.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/http/server.py')
-rw-r--r--synapse/http/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index 8077e22794..9edb957ec2 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -93,6 +93,8 @@ response_db_txn_count = metrics.register_counter(
     ),
 )
 
+# seconds spent waiting for db txns, excluding scheduling time, when processing
+# this request
 response_db_txn_duration = metrics.register_counter(
     "response_db_txn_duration_seconds", labels=["method", "servlet", "tag"],
     alternative_names=(
@@ -368,7 +370,7 @@ class RequestMetrics(object):
             context.db_txn_count, request.method, self.name, tag
         )
         response_db_txn_duration.inc_by(
-            context.db_txn_duration, request.method, self.name, tag
+            context.db_txn_duration_ms / 1000., request.method, self.name, tag
         )