summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-01 16:17:00 +0100
committerNeil Johnson <neil@matrix.org>2018-08-01 16:17:00 +0100
commit7ff44d92154875c55addc079b0ad7f303c699933 (patch)
tree37a8935ce354bcd69e10b521f0604060ec71aec0
parentfix isort (diff)
downloadsynapse-7ff44d92154875c55addc079b0ad7f303c699933.tar.xz
improve clarity
-rw-r--r--changelog.d/3630.feature2
-rw-r--r--synapse/storage/__init__.py9
2 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/3630.feature b/changelog.d/3630.feature

index 20398da9e0..8007a04840 100644 --- a/changelog.d/3630.feature +++ b/changelog.d/3630.feature
@@ -1 +1 @@ -Blocks registration and sign in if max mau value exceeded +Add ability to limit number of monthly active users on the server diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 12282a8b3d..134e4a80f1 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py
@@ -268,12 +268,13 @@ class DataStore(RoomMemberStore, RoomStore, return self.runInteraction("count_users", _count_users) def count_monthly_users(self): - """ - Counts the number of users who used this homeserver in the last 30 days + """Counts the number of users who used this homeserver in the last 30 days + This method should be refactored with count_daily_users - the only reason not to is waiting on definition of mau - returns: - defered: resolves to int + + Returns: + Defered[int] """ def _count_monthly_users(txn): thirty_days_ago = int(self._clock.time_msec()) - (1000 * 60 * 60 * 24 * 30)