summary refs log tree commit diff
path: root/synapse/config/tracer.py
diff options
context:
space:
mode:
authorJacek KuĊ›nierz <jacek.kusnierz@tum.de>2022-06-30 19:48:04 +0200
committerGitHub <noreply@github.com>2022-06-30 19:48:04 +0200
commit50f0e4028b334566a067b671d15246a9b05e8498 (patch)
treeb2fee0ce8dc2b1f81a73cf87167c8c747092ecda /synapse/config/tracer.py
parentMerge remote-tracking branch 'origin/release-v1.62' into develop (diff)
downloadsynapse-50f0e4028b334566a067b671d15246a9b05e8498.tar.xz
Allow dependency errors to pass through (#13113)
Signed-off-by: Jacek Kusnierz <jacek.kusnierz@tum.de>
Co-authored-by: Brendan Abolivier <babolivier@matrix.org>
Diffstat (limited to 'synapse/config/tracer.py')
-rw-r--r--synapse/config/tracer.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/config/tracer.py b/synapse/config/tracer.py

index 6fbf927f11..c19270c6c5 100644 --- a/synapse/config/tracer.py +++ b/synapse/config/tracer.py
@@ -15,7 +15,7 @@ from typing import Any, List, Set from synapse.types import JsonDict -from synapse.util.check_dependencies import DependencyException, check_requirements +from synapse.util.check_dependencies import check_requirements from ._base import Config, ConfigError @@ -40,12 +40,7 @@ class TracerConfig(Config): if not self.opentracer_enabled: return - try: - check_requirements("opentracing") - except DependencyException as e: - raise ConfigError( - e.message # noqa: B306, DependencyException.message is a property - ) + check_requirements("opentracing") # The tracer is enabled so sanitize the config