diff options
| author | Erik Johnston <erikj@jki.re> | 2018-08-22 17:18:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 17:18:28 +0100 |
| commit | a5806aba2751d5a658e657ed489be26869d93f4e (patch) | |
| tree | 9a9344671dc650b85a5bd42b0fb9d6649ae0834f /synapse/api/errors.py | |
| parent | Merge branch 'master' into develop (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff) | |
| download | synapse-a5806aba2751d5a658e657ed489be26869d93f4e.tar.xz | |
Merge pull request #3680 from matrix-org/neilj/server_notices_on_blocking
server notices on resource limit blocking
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index e26001ab12..c4ddba9889 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -56,7 +56,7 @@ class Codes(object): SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED" CONSENT_NOT_GIVEN = "M_CONSENT_NOT_GIVEN" CANNOT_LEAVE_SERVER_NOTICE_ROOM = "M_CANNOT_LEAVE_SERVER_NOTICE_ROOM" - RESOURCE_LIMIT_EXCEED = "M_RESOURCE_LIMIT_EXCEED" + RESOURCE_LIMIT_EXCEEDED = "M_RESOURCE_LIMIT_EXCEEDED" UNSUPPORTED_ROOM_VERSION = "M_UNSUPPORTED_ROOM_VERSION" INCOMPATIBLE_ROOM_VERSION = "M_INCOMPATIBLE_ROOM_VERSION" @@ -238,7 +238,7 @@ class ResourceLimitError(SynapseError): """ def __init__( self, code, msg, - errcode=Codes.RESOURCE_LIMIT_EXCEED, + errcode=Codes.RESOURCE_LIMIT_EXCEEDED, admin_uri=None, limit_type=None, ): |