summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-13 11:42:22 +0100
committerErik Johnston <erik@matrix.org>2015-08-13 11:42:22 +0100
commit8b7ce2945b3a1672c38008570f79c611219e183d (patch)
tree854f77b15770463b65c4d412e9bcffee8c12ee66 /synapse
parentMerge branch 'erikj/reactor_metrics' into erikj/dictionary_cache (diff)
parentDon't time getDelayedCalls (diff)
downloadsynapse-8b7ce2945b3a1672c38008570f79c611219e183d.tar.xz
Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache
Diffstat (limited to 'synapse')
-rw-r--r--synapse/metrics/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/metrics/__init__.py b/synapse/metrics/__init__.py

index e014b415f3..0be9772991 100644 --- a/synapse/metrics/__init__.py +++ b/synapse/metrics/__init__.py
@@ -158,8 +158,8 @@ def runUntilCurrentTimer(func): @functools.wraps(func) def f(*args, **kwargs): - start = time.time() * 1000 pending_calls = len(reactor.getDelayedCalls()) + start = time.time() * 1000 ret = func(*args, **kwargs) end = time.time() * 1000 tick_time.inc_by(end - start)