From 8c720ac23efd98a68d5a12447c0842e3f46784bf Mon Sep 17 00:00:00 2001 From: Kyle Sanderson Date: Wed, 15 Jun 2022 14:04:15 -0700 Subject: [PATCH] fix(indexers): don't die on failed load of custom-definitions (#303) * fix(custom-definitions): don't die on failed load --- internal/indexer/service.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/internal/indexer/service.go b/internal/indexer/service.go index ed84553..300c192 100644 --- a/internal/indexer/service.go +++ b/internal/indexer/service.go @@ -396,7 +396,14 @@ func (s *service) LoadCustomIndexerDefinitions() error { return nil } - outputDirRead, _ := os.Open(s.config.CustomDefinitions) + outputDirRead, err := os.Open(s.config.CustomDefinitions) + + if err != nil { + s.log.Warn().Stack().Msgf("failed opening custom definitions directory %q: %s", s.config.CustomDefinitions, err) + return nil + } + + defer outputDirRead.Close() //entries, err := fs.ReadDir(Definitions, "definitions") entries, err := outputDirRead.ReadDir(0) @@ -404,16 +411,12 @@ func (s *service) LoadCustomIndexerDefinitions() error { s.log.Fatal().Stack().Msgf("failed reading directory: %s", err) } - if len(entries) == 0 { - s.log.Fatal().Stack().Msgf("failed reading directory: %s", err) - return err - } - customCount := 0 for _, f := range entries { fileExtension := filepath.Ext(f.Name()) - if fileExtension != ".yaml" { + if fileExtension != ".yaml" && fileExtension != ".yml" { + s.log.Warn().Stack().Msgf("skipping unknown extension definition file: %s", f.Name()) continue }