summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-09-02 17:57:04 +0100
committerMark Haines <mark.haines@matrix.org>2014-09-02 17:57:04 +0100
commitc7a7cdf7346c9268b1d4f483b31e1fdc39b6d7e0 (patch)
tree0981bb47e64f47f3a4e57b4010f5fcb4743824d0 /synapse/config
parentTest ratelimiter (diff)
downloadsynapse-c7a7cdf7346c9268b1d4f483b31e1fdc39b6d7e0.tar.xz
Add ratelimiting function to basehandler
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/homeserver.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 18072e3196..a9aa4c735c 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -17,8 +17,10 @@ from .tls import TlsConfig
 from .server import ServerConfig
 from .logger import LoggingConfig
 from .database import DatabaseConfig
+from .ratelimiting import RatelimitConfig
 
-class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig):
+class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig,
+                       RatelimitConfig):
     pass
 
 if __name__=='__main__':