diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-27 10:18:58 -0500 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2017-10-27 12:18:58 -0300 |
| commit | 4e9eb395a18a00cf735a702d68eb5f76fb3d2416 (patch) | |
| tree | 498f0964112cb0de6da32fd254fafa882cfd4889 | |
| parent | 91b9514aafbefd5c9c10380878bef1b03245d10c (diff) | |
| download | chat-4e9eb395a18a00cf735a702d68eb5f76fb3d2416.tar.gz chat-4e9eb395a18a00cf735a702d68eb5f76fb3d2416.tar.bz2 chat-4e9eb395a18a00cf735a702d68eb5f76fb3d2416.zip | |
less impactful fix (#7729)
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 6 insertions, 0 deletions
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) |