From 4e9eb395a18a00cf735a702d68eb5f76fb3d2416 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 27 Oct 2017 10:18:58 -0500 Subject: less impactful fix (#7729) --- utils/config.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'utils') diff --git a/utils/config.go b/utils/config.go index 7b7a111d6..a26ce5728 100644 --- a/utils/config.go +++ b/utils/config.go @@ -338,6 +338,12 @@ func LoadConfig(fileName string) *model.Config { var config model.Config unmarshalErr := viper.Unmarshal(&config) + if unmarshalErr == nil { + // https://github.com/spf13/viper/issues/324 + // https://github.com/spf13/viper/issues/348 + config.PluginSettings = model.PluginSettings{} + unmarshalErr = viper.UnmarshalKey("pluginsettings", &config.PluginSettings) + } if unmarshalErr != nil { errMsg := T("utils.config.load_config.decoding.panic", map[string]interface{}{"Filename": fileName, "Error": unmarshalErr.Error()}) fmt.Fprintln(os.Stderr, errMsg) -- cgit v1.2.3-1-g7c22