mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-13 09:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove length checking and add yaml identifiers

Browse source
This commit is contained in:
Andrew Morgan (https://amorgan.xyz) 2017-12-19 08:37:56 -08:00
parent 904b586e65
commit 3c2cbb5f92
No known key found for this signature in database
GPG key ID: 174BEAB009FD176D
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/github.com/matrix-org/dendrite/common/config/config.go
View file

@ -186,7 +186,7 @@ type Dendrite struct {
// Hardcoded Username and Password // Hardcoded Username and Password
Username string `yaml:"turn_username"` Username string `yaml:"turn_username"`
Password string `yaml:"turn_password"` Password string `yaml:"turn_password"`
} } `yaml:"turn"`
// The internal addresses the components will listen on. // The internal addresses the components will listen on.
// These should not be exposed externally as they expose metrics and debugging APIs. // These should not be exposed externally as they expose metrics and debugging APIs.
@ -204,14 +204,14 @@ type Dendrite struct {
Tracing struct { Tracing struct {
// The config for the jaeger opentracing reporter. // The config for the jaeger opentracing reporter.
Jaeger jaegerconfig.Configuration `yaml:"jaeger"` Jaeger jaegerconfig.Configuration `yaml:"jaeger"`
} } `yaml:"tracing"`
// Application Services // Application Services
// https://matrix.org/docs/spec/application_service/unstable.html // https://matrix.org/docs/spec/application_service/unstable.html
ApplicationService struct { ApplicationService struct {
// Configuration files for various application services // Configuration files for various application services
ConfigFiles []string `yaml:"app_service_config_files"` ConfigFiles []string `yaml:"app_service_config_files"`
} } `yaml:"applicationservice"`
// Any information derived from the configuration options for later use. // Any information derived from the configuration options for later use.
Derived struct { Derived struct {
@ -230,7 +230,7 @@ type Dendrite struct {
// Application Services parsed from their config files // Application Services parsed from their config files
// The paths of which were given above in the main config file // The paths of which were given above in the main config file
ApplicationServices []ApplicationService ApplicationServices []ApplicationService
} } `yaml:"-"`
} }
// A Path on the filesystem. // A Path on the filesystem.
@ -377,10 +377,8 @@ func (config *Dendrite) derive() error {
} }
// Load application service configuration files // Load application service configuration files
if len(config.ApplicationService.ConfigFiles) > 0 { if err := loadAppservices(config); err != nil {
if err := loadAppservices(config); err != nil { return err
return err
}
} }
return nil return nil