From d328a93b51d22039e361178a5fcf952d9735cd3f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 18 Feb 2019 16:53:56 +0000
Subject: [PATCH] Fixup error handling and message
---
synapse/config/metrics.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/synapse/config/metrics.py b/synapse/config/metrics.py
index fc72e32d20..35f1074765 100644
--- a/synapse/config/metrics.py
+++ b/synapse/config/metrics.py
@@ -16,11 +16,8 @@
from ._base import Config, ConfigError
MISSING_SENTRY = (
- """Missing sentry_sdk library. This is required to enable sentry
+ """Missing sentry-sdk library. This is required to enable sentry
integration.
-
- Install by running:
- pip install sentry_sdk
"""
)
@@ -39,7 +36,11 @@ class MetricsConfig(Config):
except ImportError:
raise ConfigError(MISSING_SENTRY)
- self.sentry_dsn = config["sentry"]["dsn"]
+ self.sentry_dsn = config["sentry"].get("dsn")
+ if not self.sentry_dsn:
+ raise ConfigError(
+ "sentry.dsn field is required when sentry integration is enabled",
+ )
def default_config(self, report_stats=None, **kwargs):
res = """\
--
GitLab