From c20b43ed4197968cd9753cfaef7abdde4d181a8b Mon Sep 17 00:00:00 2001 From: Manuel Imperiale Date: Wed, 1 Apr 2020 14:40:59 +0200 Subject: [PATCH] NOISSUE - Fix writers loadSubjectsConfig if file is missing (#1094) Signed-off-by: Manuel Imperiale --- writers/writer.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/writers/writer.go b/writers/writer.go index e45eb3e5..5af4c9ea 100644 --- a/writers/writer.go +++ b/writers/writer.go @@ -14,11 +14,11 @@ import ( "github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/transformers" "github.com/mainflux/mainflux/transformers/senml" - nats "github.com/nats-io/nats.go" + "github.com/nats-io/nats.go" ) var ( - errOpenConfFile = errors.New("Unable to open configuration file") + errOpenConfFile = errors.New("Unable to open configuration file") errParseConfFile = errors.New("Unable to parse configuration file") ) @@ -40,7 +40,7 @@ func Start(nc *nats.Conn, repo MessageRepository, transformer transformers.Trans logger: logger, } - subjects, err := LoadSubjectsConfig(subjectsCfgPath) + subjects, err := loadSubjectsConfig(subjectsCfgPath) if err != nil { logger.Warn(fmt.Sprintf("Failed to load subjects: %s", err)) } @@ -51,7 +51,7 @@ func Start(nc *nats.Conn, repo MessageRepository, transformer transformers.Trans return err } } - return err + return nil } func (c *consumer) consume(m *nats.Msg) { @@ -86,7 +86,7 @@ type subjectsConfig struct { Subjects filterConfig `toml:"subjects"` } -func LoadSubjectsConfig(subjectsConfigPath string) ([]string, error) { +func loadSubjectsConfig(subjectsConfigPath string) ([]string, error) { data, err := ioutil.ReadFile(subjectsConfigPath) if err != nil { return []string{mainflux.InputChannels}, errors.Wrap(errOpenConfFile, err) @@ -97,5 +97,5 @@ func LoadSubjectsConfig(subjectsConfigPath string) ([]string, error) { return []string{mainflux.InputChannels}, errors.Wrap(errParseConfFile, err) } - return subjectsCfg.Subjects.List, err + return subjectsCfg.Subjects.List, nil }