Merge branch 'develop' into neilj/limit_exceeded_error

2018-08-17 12:44:26 +00:00
parent 7edd11623d a2d872e7b3
commit 69c49d3fa3
11 changed files with 35 additions and 4 deletions
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -800,7 +800,8 @@ class Auth(object):
            current_mau = yield self.store.get_monthly_active_count()
            if current_mau >= self.hs.config.max_mau_value:
                raise ResourceLimitError(
-                    403, "Monthly Active User Limits AU Limit Exceeded",
+                    403, "Monthly Active User Limit Exceeded",
+
                    admin_uri=self.hs.config.admin_uri,
                    errcode=Codes.RESOURCE_LIMIT_EXCEED,
                    limit_type="monthly_active_user"