JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: limit meta conf loaders
All checks were successful
build / build (push) Successful in 1m12s
Details
build / trigger-build-image (push) Successful in 6s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2024-10-01 01:36:30 -04:00
parent 79446e7826
commit d8ed5809cb
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/joj3/conf.go
View File

@ -6,6 +6,7 @@ import (
"log/slog" "log/slog"
"os" "os"
"regexp" "regexp"
"strings"
"github.com/joint-online-judge/JOJ3/internal/stage" "github.com/joint-online-judge/JOJ3/internal/stage"
"github.com/koding/multiconfig" "github.com/koding/multiconfig"
@ -87,7 +88,18 @@ func parseMetaConfFile(path string) (metaConf MetaConf, err error) {
}, nil }, nil
} }
d := &multiconfig.DefaultLoader{} d := &multiconfig.DefaultLoader{}
d.Loader = multiconfig.NewWithPath(path) loaders := []multiconfig.Loader{}
loaders = append(loaders, &multiconfig.TagLoader{})
if strings.HasSuffix(path, "toml") {
loaders = append(loaders, &multiconfig.TOMLLoader{Path: path})
}
if strings.HasSuffix(path, "json") {
loaders = append(loaders, &multiconfig.JSONLoader{Path: path})
}
if strings.HasSuffix(path, "yml") || strings.HasSuffix(path, "yaml") {
loaders = append(loaders, &multiconfig.YAMLLoader{Path: path})
}
d.Loader = multiconfig.MultiLoader(loaders...)
d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{}) d.Validator = multiconfig.MultiValidator(&multiconfig.RequiredValidator{})
if err = d.Load(&metaConf); err != nil { if err = d.Load(&metaConf); err != nil {
slog.Error("parse meta conf", "error", err) slog.Error("parse meta conf", "error", err)