OrgGo/Mainflux.mainflux
1
0
Fork 0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-28 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

NOISSUE - Fix writers loadSubjectsConfig if file is missing (#1094)

Browse Source 
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
This commit is contained in:
Manuel Imperiale 2020-04-01 14:40:59 +02:00 committed by GitHub
parent 46aadcfd9d
commit c20b43ed41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
writers/writer.go
View File

@ -14,11 +14,11 @@ import (
"github.com/mainflux/mainflux/logger" "github.com/mainflux/mainflux/logger"
"github.com/mainflux/mainflux/transformers" "github.com/mainflux/mainflux/transformers"
"github.com/mainflux/mainflux/transformers/senml" "github.com/mainflux/mainflux/transformers/senml"
nats "github.com/nats-io/nats.go" "github.com/nats-io/nats.go"
) )
var ( 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") errParseConfFile = errors.New("Unable to parse configuration file")
) )
@ -40,7 +40,7 @@ func Start(nc *nats.Conn, repo MessageRepository, transformer transformers.Trans
logger: logger, logger: logger,
} }
subjects, err := LoadSubjectsConfig(subjectsCfgPath) subjects, err := loadSubjectsConfig(subjectsCfgPath)
if err != nil { if err != nil {
logger.Warn(fmt.Sprintf("Failed to load subjects: %s", err)) 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 err return nil
} }
func (c *consumer) consume(m *nats.Msg) { func (c *consumer) consume(m *nats.Msg) {
@ -86,7 +86,7 @@ type subjectsConfig struct {
Subjects filterConfig `toml:"subjects"` Subjects filterConfig `toml:"subjects"`
} }
func LoadSubjectsConfig(subjectsConfigPath string) ([]string, error) { func loadSubjectsConfig(subjectsConfigPath string) ([]string, error) {
data, err := ioutil.ReadFile(subjectsConfigPath) data, err := ioutil.ReadFile(subjectsConfigPath)
if err != nil { if err != nil {
return []string{mainflux.InputChannels}, errors.Wrap(errOpenConfFile, err) 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 []string{mainflux.InputChannels}, errors.Wrap(errParseConfFile, err)
} }
return subjectsCfg.Subjects.List, err return subjectsCfg.Subjects.List, nil
} }