fix(indexers): don't crash on empty custom-definition (#311)

This commit is contained in:
Kyle Sanderson 2022-06-15 16:36:39 -07:00 committed by GitHub
parent 62392fd14c
commit 0256ea52fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -424,8 +424,6 @@ func (s *service) LoadCustomIndexerDefinitions() error {
s.log.Trace().Msgf("parsing custom: %v", file) s.log.Trace().Msgf("parsing custom: %v", file)
var d *domain.IndexerDefinition
//data, err := fs.ReadFile(Definitions, filePath) //data, err := fs.ReadFile(Definitions, filePath)
data, err := os.ReadFile(file) data, err := os.ReadFile(file)
if err != nil { if err != nil {
@ -433,12 +431,17 @@ func (s *service) LoadCustomIndexerDefinitions() error {
return err return err
} }
err = yaml.Unmarshal(data, &d) var d *domain.IndexerDefinition
if err != nil { if err = yaml.Unmarshal(data, &d); err != nil {
s.log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", file) s.log.Error().Stack().Err(err).Msgf("failed unmarshal file: %v", file)
return err return err
} }
if d == nil {
s.log.Warn().Stack().Err(err).Msgf("skipping empty file: %v", file)
continue
}
if d.Implementation == "" { if d.Implementation == "" {
d.Implementation = "irc" d.Implementation = "irc"
} }