From 9d4038427de377602215f0ed6e340931b8aa5065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E3=81=AE=E3=81=8B=E3=81=88=E3=81=A7?= Date: Fri, 1 Jan 2021 20:16:22 +0800 Subject: [PATCH] Enable loading TOML & YAML by confdir (#120) --- main/run.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/run.go b/main/run.go index d1b929ff..12243b45 100644 --- a/main/run.go +++ b/main/run.go @@ -8,6 +8,7 @@ import ( "os/signal" "path" "path/filepath" + "regexp" "runtime" "runtime/debug" "strings" @@ -120,7 +121,11 @@ func readConfDir(dirPath string) { log.Fatalln(err) } for _, f := range confs { - if strings.HasSuffix(f.Name(), ".json") { + matched, err := regexp.MatchString(`^.+\.(json|toml|yaml|yml)$`, f.Name()) + if err != nil { + log.Fatalln(err) + } + if matched { configFiles.Set(path.Join(dirPath, f.Name())) } }