summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-26 14:15:30 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-26 14:15:30 +0000
commit9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e (patch)
treee5204acaabdbcd361c70a2422d08672b003372d0 /synapse/app/homeserver.py
parentPrevent account_data content from being sent over TCP replication (#6333) (diff)
parent1.6.0 (diff)
downloadsynapse-9fb350af65e22b917ce5fe9b1a2f21cc9e8d833e.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
-rw-r--r--synapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 73e2c29d06..883b3fb70b 100644
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -585,7 +585,7 @@ def run(hs):
     def performance_stats_init():
         _stats_process.clear()
         _stats_process.append(
-            (int(hs.get_clock().time(), resource.getrusage(resource.RUSAGE_SELF)))
+            (int(hs.get_clock().time()), resource.getrusage(resource.RUSAGE_SELF))
         )
 
     def start_phone_stats_home():