Merge branch 'develop' into neilj/limit_exceeded_error

This commit is contained in:
Neil Johnson 2018-08-17 12:44:26 +00:00 committed by GitHub
commit 69c49d3fa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 35 additions and 4 deletions

View file

@ -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"