Browse Source

filter .json in confDir

pull/2148/head
vcptr 5 years ago
parent
commit
c3f55dcd67
  1. 4
      infra/control/config.go
  2. 4
      main/main.go

4
infra/control/config.go

@ -41,7 +41,9 @@ func (c *ConfigCommand) Execute(args []string) error {
r, err := c.LoadArg(arg)
common.Must(err)
c, err := serial.DecodeJSONConfig(r)
common.Must(err)
if err != nil {
ctllog.Fatalln(err)
}
conf.Override(c, arg)
}

4
main/main.go

@ -46,7 +46,9 @@ func readConfDir(dirPath string) {
log.Fatalln(err)
}
for _, f := range confs {
configFiles.Set(path.Join(dirPath, f.Name()))
if strings.HasSuffix(f.Name(), ".json") {
configFiles.Set(path.Join(dirPath, f.Name()))
}
}
}

Loading…
Cancel
Save