Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
a8251da1
Unverified
Commit
a8251da1
authored
5 years ago
by
Jorik Schellekens
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Blow up config if opentracing is missing (#5985)
* Blow up config if opentracing is missing
parent
f1b40694
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/5985.feature
+1
-0
1 addition, 0 deletions
changelog.d/5985.feature
synapse/config/tracer.py
+7
-0
7 additions, 0 deletions
synapse/config/tracer.py
with
8 additions
and
0 deletions
changelog.d/5985.feature
0 → 100644
+
1
−
0
View file @
a8251da1
Check
at
setup
that
opentracing
is
installed
if
it's
enabled
in
the
config.
This diff is collapsed.
Click to expand it.
synapse/config/tracer.py
+
7
−
0
View file @
a8251da1
...
...
@@ -13,6 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from
synapse.python_dependencies
import
DependencyException
,
check_requirements
from
._base
import
Config
,
ConfigError
...
...
@@ -32,6 +34,11 @@ class TracerConfig(Config):
if
not
self
.
opentracer_enabled
:
return
try
:
check_requirements
(
"
opentracing
"
)
except
DependencyException
as
e
:
raise
ConfigError
(
e
.
message
)
# The tracer is enabled so sanitize the config
self
.
opentracer_whitelist
=
opentracing_config
.
get
(
"
homeserver_whitelist
"
,
[])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment