mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

chore(cmd/config): drop support for json and toml

Browse source
This commit is contained in:
genofire 2022-09-04 09:47:35 +02:00
parent e27e6a26d9
commit 1ac9ca055b
3 changed files with 3 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/dendrite/config_generate.go
View file

@ -39,19 +39,7 @@ var generateConfigCmd = &cobra.Command{
k.Load(structs.Provider(cfg, "config"), nil)
var parser koanf.Parser
if configPath != "" {
var fileExt string
parser, fileExt = getParser(configPath)
if parser == nil {
fmt.Println("unsupported file extention:", fileExt)
os.Exit(1)
}
} else {
parser = yaml.Parser()
}
b, err := k.Marshal(parser)
b, err := k.Marshal(yaml.Parser())
if err != nil {
fmt.Println("unable to generate yaml", err)
os.Exit(1)

23
cmd/dendrite/helper_config.go
View file

@ -7,31 +7,8 @@ import (
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/gomatrixserverlib"
"github.com/knadh/koanf"
"github.com/knadh/koanf/parsers/json"
"github.com/knadh/koanf/parsers/toml"
"github.com/knadh/koanf/parsers/yaml"
)
var (
configExtParser = map[string]koanf.Parser{
".json": json.Parser(),
".toml": toml.Parser(),
".yaml": yaml.Parser(),
".yml": yaml.Parser(),
}
)
func getParser(configPath string) (koanf.Parser, string) {
fileExt := filepath.Ext(configPath)
parser, ok := configExtParser[fileExt]
if !ok {
return nil, fileExt
}
return parser, fileExt
}
var (
serverName string
dbURI string

8
cmd/dendrite/helper_readconfig.go
View file

@ -7,6 +7,7 @@ import (
"strings"
"github.com/knadh/koanf"
"github.com/knadh/koanf/parsers/yaml"
"github.com/knadh/koanf/providers/env"
"github.com/knadh/koanf/providers/file"
"github.com/spf13/cobra"
@ -31,12 +32,7 @@ func readConfig(generate bool, monolithic bool, configPath, dirPath string) {
k := koanf.New("/")
if configPath != "" {
parser, fileExt := getParser(configPath)
if parser == nil {
fmt.Println("unsupported file extention:", fileExt)
os.Exit(1)
}
if err := k.Load(file.Provider(configPath), parser); err != nil {
if err := k.Load(file.Provider(configPath), yaml.Parser()); err != nil {
fmt.Println("read file config:", err)
os.Exit(1)
}