mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 21:47:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use config.Map for global config directives

Browse source
This commit is contained in:
fox.cpp 2019-04-06 02:38:32 +03:00 • committed by Simon Ser
parent a72eb5d968
commit 18f71d8fc8
2 changed files with 58 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

29
maddy.go
View file

@ -19,26 +19,17 @@ type modInfo struct {
func Start(cfg []config.Node) error {
instances := make(map[string]modInfo)
globalCfg := make(map[string]config.Node)
for _, block := range cfg {
switch block.Name {
case "tls", "hostname", "debug":
globalCfg[block.Name] = block
continue
}
globals := config.NewMap(nil, &config.Node{Children: cfg})
globals.String("hostname", false, false, "", nil)
globals.Custom("tls", false, true, nil, tlsDirective, nil)
globals.Bool("debug", false, &log.DefaultLogger.Debug)
globals.AllowUnknown()
unmatched, err := globals.Process()
if err != nil {
return err
}
if _, ok := globalCfg["debug"]; ok {
log.DefaultLogger.Debug = true
}
for _, block := range cfg {
switch block.Name {
case "hostname", "tls", "debug":
continue
}
for _, block := range unmatched {
var instName string
if len(block.Args) == 0 {
instName = block.Name
@ -72,7 +63,7 @@ func Start(cfg []config.Node) error {
for _, inst := range instances {
log.Debugln("module init", inst.instance.Name(), inst.instance.InstanceName())
if err := inst.instance.Init(config.NewMap(globalCfg, &inst.cfg)); err != nil {
if err := inst.instance.Init(config.NewMap(globals.Values, &inst.cfg)); err != nil {
return err
}
}