diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 96c45b7209..82979e7d1b 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -18,9 +18,10 @@ import logging
import os
import sys
-from prometheus_client import Gauge
from six import iteritems
+from prometheus_client import Gauge
+
from twisted.application import service
from twisted.internet import defer, reactor
from twisted.web.resource import EncodingResourceWrapper, NoResource
@@ -300,12 +301,15 @@ class SynapseHomeServer(HomeServer):
except IncorrectDatabaseSetup as e:
quit_with_error(e.message)
+
# Gauges to expose monthly active user control metrics
current_mau_gauge = Gauge("synapse_admin_current_mau", "Current MAU")
max_mau_value_gauge = Gauge("synapse_admin_max_mau_value", "MAU Limit")
limit_usage_by_mau_gauge = Gauge(
"synapse_admin_limit_usage_by_mau", "MAU Limiting enabled"
)
+
+
def setup(config_options):
"""
Args:
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 8b335bff3f..9af42a93ad 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -70,7 +70,7 @@ class ServerConfig(Config):
# Options to control access by tracking MAU
self.limit_usage_by_mau = config.get("limit_usage_by_mau", False)
self.max_mau_value = config.get(
- "max_mau_value", 0,
+ "max_mau_value", 0,
)
# FIXME: federation_domain_whitelist needs sytests
self.federation_domain_whitelist = None
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index f3734f11bd..28f1c1afbb 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -903,9 +903,10 @@ class AuthHandler(BaseHandler):
current_mau = self.store.count_monthly_users()
if current_mau >= self.hs.config.max_mau_value:
raise AuthError(
- 403, "MAU Limit Exceeded", errcode=Codes.MAU_LIMIT_EXCEEDED
+ 403, "MAU Limit Exceeded", errcode=Codes.MAU_LIMIT_EXCEEDED
)
+
@attr.s
class MacaroonGenerator(object):
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index 044e988e92..4747118ed7 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -60,6 +60,7 @@ from .util.id_generators import ChainedIdGenerator, IdGenerator, StreamIdGenerat
logger = logging.getLogger(__name__)
+
class DataStore(RoomMemberStore, RoomStore,
RegistrationStore, StreamStore, ProfileStore,
PresenceStore, TransactionStore,
@@ -291,8 +292,6 @@ class DataStore(RoomMemberStore, RoomStore,
finally:
txn.close()
-
-
def count_r30_users(self):
"""
Counts the number of 30 day retained users, defined as:-
diff --git a/synapse/storage/schema/delta/50/make_event_content_nullable.py b/synapse/storage/schema/delta/50/make_event_content_nullable.py
index 7d27342e39..6dd467b6c5 100644
--- a/synapse/storage/schema/delta/50/make_event_content_nullable.py
+++ b/synapse/storage/schema/delta/50/make_event_content_nullable.py
@@ -88,5 +88,5 @@ def run_upgrade(cur, database_engine, *args, **kwargs):
"UPDATE sqlite_master SET sql=? WHERE tbl_name='events' AND type='table'",
(sql, ),
)
- cur.execute("PRAGMA schema_version=%i" % (oldver+1,))
+ cur.execute("PRAGMA schema_version=%i" % (oldver + 1,))
cur.execute("PRAGMA writable_schema=OFF")
|
