diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-02-13 16:45:36 +0000 |
| commit | ddb6a79b68da119bd91659ab8046553a02a4066e (patch) | |
| tree | 3a92b5c0738163474765a9ce4f1b7894fed9efde /synapse/http/site.py | |
| parent | move search reindex to schema 47 (diff) | |
| parent | Merge branch 'develop' into matthew/gin_work_mem (diff) | |
| download | synapse-ddb6a79b68da119bd91659ab8046553a02a4066e.tar.xz | |
Merge branch 'matthew/gin_work_mem' into matthew/hit_the_gin
Diffstat (limited to '')
| -rw-r--r-- | synapse/http/site.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index cd1492b1c3..e422c8dfae 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -66,14 +66,15 @@ class SynapseRequest(Request): context = LoggingContext.current_context() ru_utime, ru_stime = context.get_resource_usage() db_txn_count = context.db_txn_count - db_txn_duration = context.db_txn_duration + 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 = (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,7 +82,8 @@ class SynapseRequest(Request): int(time.time() * 1000) - self.start_time, int(ru_utime * 1000), int(ru_stime * 1000), - int(db_txn_duration * 1000), + db_sched_duration_ms, + db_txn_duration_ms, int(db_txn_count), self.sentLength, self.code, |