GitHub/matterbridge
3
0
Fork 0
mirror of https://github.com/42wim/matterbridge.git synced 2024-12-19 09:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Clean up config loading. (#561)

Browse Source
This commit is contained in:
Patrick Connolly 2018-11-08 05:32:12 +08:00 committed by Wim
parent d2a1dc792f
commit f2703979a4
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
bridge/config/config.go
View File

@ -2,7 +2,7 @@ package config
import ( import (
"bytes" "bytes"
"os" "io/ioutil"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -183,42 +183,38 @@ type Config struct {
func NewConfig(cfgfile string) *Config { func NewConfig(cfgfile string) *Config {
log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true, FullTimestamp: false}) log.SetFormatter(&prefixed.TextFormatter{PrefixPadding: 13, DisableColors: true, FullTimestamp: false})
flog := log.WithFields(log.Fields{"prefix": "config"}) flog := log.WithFields(log.Fields{"prefix": "config"})
var cfg ConfigValues
viper.SetConfigType("toml")
viper.SetConfigFile(cfgfile) viper.SetConfigFile(cfgfile)
viper.SetEnvPrefix("matterbridge") input, err := getFileContents(cfgfile)
viper.AddConfigPath(".")
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
viper.AutomaticEnv()
f, err := os.Open(cfgfile)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
err = viper.ReadConfig(f) mycfg := NewConfigFromString(input)
if err != nil { if mycfg.ConfigValues.General.MediaDownloadSize == 0 {
log.Fatal(err) mycfg.ConfigValues.General.MediaDownloadSize = 1000000
}
err = viper.Unmarshal(&cfg)
if err != nil {
log.Fatal("blah", err)
}
mycfg := new(Config)
mycfg.v = viper.GetViper()
if cfg.General.MediaDownloadSize == 0 {
cfg.General.MediaDownloadSize = 1000000
} }
viper.WatchConfig() viper.WatchConfig()
viper.OnConfigChange(func(e fsnotify.Event) { viper.OnConfigChange(func(e fsnotify.Event) {
flog.Println("Config file changed:", e.Name) flog.Println("Config file changed:", e.Name)
}) })
mycfg.ConfigValues = &cfg
return mycfg return mycfg
} }
func getFileContents(filename string) ([]byte, error) {
input, err := ioutil.ReadFile(filename)
if err != nil {
log.Fatal(err)
return []byte(nil), err
}
return input, nil
}
func NewConfigFromString(input []byte) *Config { func NewConfigFromString(input []byte) *Config {
var cfg ConfigValues var cfg ConfigValues
viper.SetConfigType("toml") viper.SetConfigType("toml")
viper.SetEnvPrefix("matterbridge")
viper.AddConfigPath(".")
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_", "-", "_"))
viper.AutomaticEnv()
err := viper.ReadConfig(bytes.NewBuffer(input)) err := viper.ReadConfig(bytes.NewBuffer(input))
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)