Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache

2015-08-13 11:42:22 +01:00 · 2015-08-13 11:42:22 +01:00 · 8b7ce2945b
parent c044aca1fd a6c27de1aa
commit 8b7ce2945b
1 changed files with 1 additions and 1 deletions
--- 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)