0ct0pu5/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'acquisition-refactoring' of github.com:crowdsecurity/crowdsec into acquisition-refactoring

Browse source
This commit is contained in:
bui 2021-04-29 15:12:17 +02:00
commit 5fad7baf17
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/acquisition/modules/file/file.go
View file

@ -45,25 +45,25 @@ func (f *FileSource) Configure(Config []byte, logger *log.Entry) error {
f.tails = make(map[string]bool) f.tails = make(map[string]bool)
err := yaml.UnmarshalStrict(Config, &fileConfig) err := yaml.UnmarshalStrict(Config, &fileConfig)
if err != nil { if err != nil {
return errors.Wrap(err, "[fileacquisition] Cannot parse FileAcquisition configuration") return errors.Wrap(err, "Cannot parse FileAcquisition configuration")
} }
f.logger.Tracef("FileAcquisition configuration: %+v", fileConfig) f.logger.Tracef("FileAcquisition configuration: %+v", fileConfig)
if len(fileConfig.Filename) != 0 { if len(fileConfig.Filename) != 0 {
fileConfig.Filenames = append(fileConfig.Filenames, fileConfig.Filename) fileConfig.Filenames = append(fileConfig.Filenames, fileConfig.Filename)
} }
if len(fileConfig.Filenames) == 0 { if len(fileConfig.Filenames) == 0 {
return fmt.Errorf("[fileacquisition] no filename or filenames configuration provided") return fmt.Errorf("no filename or filenames configuration provided")
} }
f.config = fileConfig f.config = fileConfig
f.watcher, err = fsnotify.NewWatcher() f.watcher, err = fsnotify.NewWatcher()
if err != nil { if err != nil {
return errors.Wrapf(err, "[fileacquisition] Could not create fsnotify watcher") return errors.Wrapf(err, "Could not create fsnotify watcher")
} }
f.logger.Tracef("Actual FileAcquisition Configuration %+v", f.config) f.logger.Tracef("Actual FileAcquisition Configuration %+v", f.config)
for _, pattern := range f.config.Filenames { for _, pattern := range f.config.Filenames {
files, err := filepath.Glob(pattern) files, err := filepath.Glob(pattern)
if err != nil { if err != nil {
return errors.Wrap(err, "[fileacquisition] Glob failure") return errors.Wrap(err, "Glob failure")
} }
if len(files) == 0 { if len(files) == 0 {
f.logger.Infof("No matching files for pattern %s", pattern) f.logger.Infof("No matching files for pattern %s", pattern)