summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-16 18:02:02 +0100
committerNeil Johnson <neil@matrix.org>2018-08-16 18:02:02 +0100
commit13ad9930c8799ea54671a6ce00533528d89e061b (patch)
tree1633a590e06bc0c42c4d438918b5d1bf3a4c476a /synapse/config
parentAdd GET media/v1/config (#3184) (diff)
downloadsynapse-13ad9930c8799ea54671a6ce00533528d89e061b.tar.xz
add new error type ResourceLimit
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py

index 2190f3210a..ae72c872d9 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -81,6 +81,7 @@ class ServerConfig(Config): # Options to disable HS self.hs_disabled = config.get("hs_disabled", False) self.hs_disabled_message = config.get("hs_disabled_message", "") + self.hs_disabled_limit_type = config.get("hs_disabled_limit_type", "") # Admin uri to direct users at should their instance become blocked # due to resource constraints