Fix identify defaults not returning by using main viper instance (#1979)

This commit is contained in:
Releck
2021-11-09 22:32:47 +00:00
committed by GitHub
parent bd0de23459
commit d316aeca16

View File

@@ -936,10 +936,11 @@ func (i *Instance) GetDeleteGeneratedDefault() bool {
func (i *Instance) GetDefaultIdentifySettings() *models.IdentifyMetadataTaskOptions { func (i *Instance) GetDefaultIdentifySettings() *models.IdentifyMetadataTaskOptions {
i.RLock() i.RLock()
defer i.RUnlock() defer i.RUnlock()
v := i.viper(DefaultIdentifySettings)
if viper.IsSet(DefaultIdentifySettings) { if v.IsSet(DefaultIdentifySettings) {
var ret models.IdentifyMetadataTaskOptions var ret models.IdentifyMetadataTaskOptions
if err := viper.UnmarshalKey(DefaultIdentifySettings, &ret); err != nil { if err := v.UnmarshalKey(DefaultIdentifySettings, &ret); err != nil {
return nil return nil
} }
return &ret return &ret