diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2018-08-10 01:10:29 -0700 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-08-10 10:10:29 +0200 |
| commit | 4299ef312bfcafaa12546e929258a718ea19e9d7 (patch) | |
| tree | c61bbd6f93cb3378b6533e160951e87e4a7cf6d7 /utils/config.go | |
| parent | 7649488a268f74c21524ab440411eac0a35b26e2 (diff) | |
| download | chat-4299ef312bfcafaa12546e929258a718ea19e9d7.tar.gz chat-4299ef312bfcafaa12546e929258a718ea19e9d7.tar.bz2 chat-4299ef312bfcafaa12546e929258a718ea19e9d7.zip | |
MM-11382 Remove special handling of PluginSettings when loading config (#9234)
* MM-11382 Only override PluginSettings from environment when necessary
* MM-11382 Remove special handling of PluginSettings when loading config
* Add extra unit test
Diffstat (limited to 'utils/config.go')
| -rw-r--r-- | utils/config.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/utils/config.go b/utils/config.go index 4bbe4cd15..9e445bf5c 100644 --- a/utils/config.go +++ b/utils/config.go @@ -247,12 +247,6 @@ func ReadConfig(r io.Reader, allowEnvironmentOverrides bool) (*model.Config, map var config model.Config unmarshalErr := v.Unmarshal(&config) - if unmarshalErr == nil { - // https://github.com/spf13/viper/issues/324 - // https://github.com/spf13/viper/issues/348 - config.PluginSettings = model.PluginSettings{} - unmarshalErr = v.UnmarshalKey("pluginsettings", &config.PluginSettings) - } envConfig := v.EnvSettings() |