Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve naming

This commit is contained in:
Neil Johnson 2018-09-12 16:22:15 +01:00
parent 5cea4e16c7
commit 8decd6233d
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/3846.feature
View File

@ -1 +1 @@
create synapse_admin_mau:reserved metric to expose number of real reaserved users Add synapse_admin_mau:registered_reserved_users metric to expose number of real reaserved users

14
synapse/app/homeserver.py
View File

@ -307,7 +307,10 @@ class SynapseHomeServer(HomeServer):
# Gauges to expose monthly active user control metrics # Gauges to expose monthly active user control metrics
current_mau_gauge = Gauge("synapse_admin_mau:current", "Current MAU") current_mau_gauge = Gauge("synapse_admin_mau:current", "Current MAU")
max_mau_gauge = Gauge("synapse_admin_mau:max", "MAU Limit") max_mau_gauge = Gauge("synapse_admin_mau:max", "MAU Limit")
reserved_mau_gauge = Gauge("synapse_admin_mau:reserved", "Reserved real MAU users") registered_reserved_users_mau_gauge = Gauge(
"synapse_admin_mau:registered_reserved_users",
"Registered users with reserved threepids"
)
def setup(config_options): def setup(config_options):
@ -533,12 +536,13 @@ def run(hs):
@defer.inlineCallbacks @defer.inlineCallbacks
def generate_monthly_active_users(): def generate_monthly_active_users():
current_mau_count = 0 current_mau_count = 0
reserved_mau_count = 0 reserved_count = 0
store = hs.get_datastore()
if hs.config.limit_usage_by_mau: if hs.config.limit_usage_by_mau:
current_mau_count = yield hs.get_datastore().get_monthly_active_count() current_mau_count = yield store.get_monthly_active_count()
reserved_mau_count = yield hs.get_datastore().get_reserved_real_user_account() reserved_count = yield store.get_registered_reserved_users_count()
current_mau_gauge.set(float(current_mau_count)) current_mau_gauge.set(float(current_mau_count))
reserved_mau_gauge.set(float(reserved_mau_count)) registered_reserved_users_mau_gauge.set(float(reserved_count))
max_mau_gauge.set(float(hs.config.max_mau_value)) max_mau_gauge.set(float(hs.config.max_mau_value))
hs.get_datastore().initialise_reserved_users( hs.get_datastore().initialise_reserved_users(

2
synapse/storage/monthly_active_users.py
View File

@ -147,7 +147,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
return self.runInteraction("count_users", _count_users) return self.runInteraction("count_users", _count_users)
@defer.inlineCallbacks @defer.inlineCallbacks
def get_reserved_real_user_account(self): def get_registered_reserved_users_count(self):
"""Of the reserved threepids defined in config, how many are associated """Of the reserved threepids defined in config, how many are associated
with registered users? with registered users?

6
tests/storage/test_monthly_active_users.py
View File

@ -186,7 +186,7 @@ class MonthlyActiveUsersTestCase(HomeserverTestCase):
def test_get_reserved_real_user_account(self): def test_get_reserved_real_user_account(self):
# Test no reserved users, or reserved threepids # Test no reserved users, or reserved threepids
count = self.store.get_reserved_real_user_account() count = self.store.get_registered_reserved_users_count()
self.assertEquals(self.get_success(count), 0) self.assertEquals(self.get_success(count), 0)
# Test reserved users but no registered users # Test reserved users but no registered users
@ -201,7 +201,7 @@ class MonthlyActiveUsersTestCase(HomeserverTestCase):
self.hs.config.mau_limits_reserved_threepids = threepids self.hs.config.mau_limits_reserved_threepids = threepids
self.store.initialise_reserved_users(threepids) self.store.initialise_reserved_users(threepids)
self.pump() self.pump()
count = self.store.get_reserved_real_user_account() count = self.store.get_registered_reserved_users_count()
self.assertEquals(self.get_success(count), 0) self.assertEquals(self.get_success(count), 0)
# Test reserved registed users # Test reserved registed users
@ -212,5 +212,5 @@ class MonthlyActiveUsersTestCase(HomeserverTestCase):
now = int(self.hs.get_clock().time_msec()) now = int(self.hs.get_clock().time_msec())
self.store.user_add_threepid(user1, "email", user1_email, now, now) self.store.user_add_threepid(user1, "email", user1_email, now, now)
self.store.user_add_threepid(user2, "email", user2_email, now, now) self.store.user_add_threepid(user2, "email", user2_email, now, now)
count = self.store.get_reserved_real_user_account() count = self.store.get_registered_reserved_users_count()
self.assertEquals(self.get_success(count), len(threepids)) self.assertEquals(self.get_success(count), len(threepids))