summary refs log tree commit diff
path: root/synapse/http/site.py
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2018-01-17 14:29:37 +0000
committerGitHub <noreply@github.com>2018-01-17 14:29:37 +0000
commita7e4ff9ccaad33c7a193fd2bf233260ada10f3e9 (patch)
tree0bb7d6f5f5bdeb7081e810bc119820b36b51d943 /synapse/http/site.py
parentMerge pull request #2797 from matrix-org/rav/user_id_checking (diff)
parentMerge remote-tracking branch 'origin/develop' into rav/track_db_scheduling (diff)
downloadsynapse-a7e4ff9ccaad33c7a193fd2bf233260ada10f3e9.tar.xz
Merge pull request #2795 from matrix-org/rav/track_db_scheduling
Track DB scheduling delay per-request
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r--synapse/http/site.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py

index dc64f0f6f5..e422c8dfae 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py
@@ -67,13 +67,14 @@ class SynapseRequest(Request): ru_utime, ru_stime = context.get_resource_usage() db_txn_count = context.db_txn_count db_txn_duration_ms = context.db_txn_duration_ms + db_sched_duration_ms = context.db_sched_duration_ms except Exception: ru_utime, ru_stime = (0, 0) db_txn_count, db_txn_duration_ms = (0, 0) self.site.access_logger.info( "%s - %s - {%s}" - " Processed request: %dms (%dms, %dms) (%dms/%d)" + " Processed request: %dms (%dms, %dms) (%dms/%dms/%d)" " %sB %s \"%s %s %s\" \"%s\"", self.getClientIP(), self.site.site_tag, @@ -81,6 +82,7 @@ class SynapseRequest(Request): int(time.time() * 1000) - self.start_time, int(ru_utime * 1000), int(ru_stime * 1000), + db_sched_duration_ms, db_txn_duration_ms, int(db_txn_count), self.sentLength,