diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
commit | 25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a (patch) | |
tree | 64576e7083a569f13765c8d3a41fe6326ac631fa /synapse/storage/_base.py | |
parent | WIP impl commiting to get feedback (diff) | |
parent | initial cut at a room summary API (#3574) (diff) | |
download | synapse-25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r-- | synapse/storage/_base.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 44f37b4c1e..08dffd774f 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -1150,17 +1150,16 @@ class SQLBaseStore(object): defer.returnValue(retval) def get_user_count_txn(self, txn): - """Get a total number of registerd users in the users list. + """Get a total number of registered users in the users list. Args: txn : Transaction object Returns: - defer.Deferred: resolves to int + int : number of users """ sql_count = "SELECT COUNT(*) FROM users WHERE is_guest = 0;" txn.execute(sql_count) - count = txn.fetchone()[0] - defer.returnValue(count) + return txn.fetchone()[0] def _simple_search_list(self, table, term, col, retcols, desc="_simple_search_list"): |