summary refs log tree commit diff
path: root/synapse/config/metrics.py
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-09-11 14:00:37 +0100
committerGitHub <noreply@github.com>2019-09-11 14:00:37 +0100
commit6604b64fae970f534d3e2a61f2fbbe51599fa26d (patch)
tree24c672f4683aa711084c99d1258f0e9c9aeabeef /synapse/config/metrics.py
parentFix existing v2 identity server calls (MSC2140) (#6013) (diff)
downloadsynapse-6604b64fae970f534d3e2a61f2fbbe51599fa26d.tar.xz
Check dependencies on setup in the nicer way. (#5989)
Diffstat (limited to 'synapse/config/metrics.py')
-rw-r--r--synapse/config/metrics.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py

index 653b990e67..9eb1e55ddb 100644 --- a/synapse/config/metrics.py +++ b/synapse/config/metrics.py
@@ -16,11 +16,9 @@ import attr -from ._base import Config, ConfigError +from synapse.python_dependencies import DependencyException, check_requirements -MISSING_SENTRY = """Missing sentry-sdk library. This is required to enable sentry - integration. - """ +from ._base import Config, ConfigError @attr.s @@ -51,9 +49,9 @@ class MetricsConfig(Config): self.sentry_enabled = "sentry" in config if self.sentry_enabled: try: - import sentry_sdk # noqa F401 - except ImportError: - raise ConfigError(MISSING_SENTRY) + check_requirements("sentry") + except DependencyException as e: + raise ConfigError(e.message) self.sentry_dsn = config["sentry"].get("dsn") if not self.sentry_dsn: