summary refs log tree commit diff
path: root/synapse/handlers/stats.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 08:56:24 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-14 08:56:24 +0100
commit703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6 (patch)
treec1505d3d2e4dbce686e5617032db2df87182824a /synapse/handlers/stats.py
parentNewsfile (diff)
parent1.3.0rc1 (diff)
downloadsynapse-703f9ff3c9e757caf4c17b2d34dd500f1ad99dd6.tar.xz
Merge branch 'develop' into rei/room_stats_separated
Diffstat (limited to 'synapse/handlers/stats.py')
-rw-r--r--synapse/handlers/stats.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/stats.py b/synapse/handlers/stats.py

index 3590133a32..dee19cdcec 100644 --- a/synapse/handlers/stats.py +++ b/synapse/handlers/stats.py
@@ -89,7 +89,7 @@ class StatsHandler(StateDeltasHandler): # If still None then the initial background update hasn't started yet if self.pos is None or None in self.pos.values(): - defer.returnValue(None) + return None # Loop round handling deltas until we're up to date with Measure(self.clock, "stats_delta"): @@ -380,6 +380,6 @@ class StatsHandler(StateDeltasHandler): == "world_readable" ) ): - defer.returnValue(True) + return True else: - defer.returnValue(False) + return False