opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

less impactful fix (#7729)

Browse Source
This commit is contained in:
Chris
2017-10-27 12:18:58 -03:00
committed by enahum
parent 91b9514aaf
commit 4e9eb395a1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/config.go
+6
View File
@@ -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)