summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorPaul Evans <leonerd@leonerd.org.uk>2015-03-13 17:31:10 +0000
committerPaul Evans <leonerd@leonerd.org.uk>2015-03-13 17:31:10 +0000
commite731d30d90680b98237aaff7e655f26e942f468c (patch)
treef04bf166aca228c53af3a1cb2d4626f4889cbf61 /synapse/config/homeserver.py
parentAlso bump dependency link version (diff)
parentMerge remote-tracking branch 'origin/develop' into metrics (diff)
downloadsynapse-e731d30d90680b98237aaff7e655f26e942f468c.tar.xz
Merge pull request #108 from matrix-org/metrics
Metrics
Diffstat (limited to 'synapse/config/homeserver.py')
-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 c024535f52..241afdf872 100644 --- a/synapse/config/homeserver.py +++ b/synapse/config/homeserver.py
@@ -23,11 +23,13 @@ from .captcha import CaptchaConfig from .email import EmailConfig from .voip import VoipConfig from .registration import RegistrationConfig +from .metrics import MetricsConfig class HomeServerConfig(TlsConfig, ServerConfig, DatabaseConfig, LoggingConfig, RatelimitConfig, ContentRepositoryConfig, CaptchaConfig, - EmailConfig, VoipConfig, RegistrationConfig,): + EmailConfig, VoipConfig, RegistrationConfig, + MetricsConfig,): pass