diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-17 12:44:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 12:44:26 +0000 |
commit | 69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc (patch) | |
tree | a2a6e5b2b873ffb119d6124e4b9feae56bc22bbd /synapse/api | |
parent | add new error type ResourceLimit (diff) | |
parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
download | synapse-69c49d3fa3dc91ff6cbbadb52dc14e60cb063ecc.tar.xz |
Merge branch 'develop' into neilj/limit_exceeded_error
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/auth.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 6945c118d3..022211e34e 100644 --- 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" |