tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

remove twisted deferral cruft

Browse source
This commit is contained in:
Neil Johnson 2018-03-28 16:25:53 +01:00
parent 4262aba17b
commit 241e4e8687
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
synapse/storage/__init__.py
View file

@ -244,7 +244,6 @@ class DataStore(RoomMemberStore, RoomStore,
return [UserPresenceState(**row) for row in rows]
@defer.inlineCallbacks
def count_daily_users(self):
"""
Counts the number of users who used this homeserver in the last 24 hours.
@ -264,10 +263,9 @@ class DataStore(RoomMemberStore, RoomStore,
count, = txn.fetchone()
return count
ret = yield self.runInteraction("count_users", _count_users)
defer.returnValue(ret)
return self.runInteraction("count_users", _count_users)
@defer.inlineCallbacks
def count_r30_users(self):
"""
Counts the number of 30 day retained users, defined as:-
@ -320,8 +318,7 @@ class DataStore(RoomMemberStore, RoomStore,
results["ALL"], = txn.fetchone()
return results
ret = yield self.runInteraction("count_r30_users", _count_r30_users)
defer.returnValue(ret)
return self.runInteraction("count_r30_users", _count_r30_users)
def get_users(self):
"""Function to reterive a list of users in users table.