From ebfa952c28964b0b0d235c2c59447dc3bdcfab38 Mon Sep 17 00:00:00 2001 From: Sebastien Blot Date: Tue, 4 May 2021 15:54:11 +0200 Subject: [PATCH] wip --- pkg/acquisition/acquisition.go | 13 ++----------- pkg/acquisition/modules/file/file.go | 2 +- pkg/acquisition/modules/file/file_reader_test.go | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/acquisition/acquisition.go b/pkg/acquisition/acquisition.go index 94adccc6e..74321b38a 100644 --- a/pkg/acquisition/acquisition.go +++ b/pkg/acquisition/acquisition.go @@ -7,9 +7,8 @@ import ( "strings" "github.com/crowdsecurity/crowdsec/pkg/acquisition/configuration" - file_acquisition "github.com/crowdsecurity/crowdsec/pkg/acquisition/modules/file" + fileacquisition "github.com/crowdsecurity/crowdsec/pkg/acquisition/modules/file" journalctlacquisition "github.com/crowdsecurity/crowdsec/pkg/acquisition/modules/journalctl" - syslog_acquisition "github.com/crowdsecurity/crowdsec/pkg/acquisition/modules/syslog" "github.com/crowdsecurity/crowdsec/pkg/csconfig" "github.com/crowdsecurity/crowdsec/pkg/types" "github.com/pkg/errors" @@ -66,10 +65,6 @@ We support acquisition in two modes : One DataSourceCfg can lead to multiple goroutines, hence the Tombs passing around to allow proper tracking. tail mode shouldn't return except on errors or when externally killed via tombs. cat mode will return once source has been exhausted. - - - TBD in current iteration : - - how to deal with "file was not present at startup but might appear later" ? */ // The interface each datasource must implement @@ -91,11 +86,7 @@ var AcquisitionSources = []struct { }{ { name: "file", - iface: func() DataSource { return &file_acquisition.FileSource{} }, - }, - { - name: "syslog", - iface: func() DataSource { return &syslog_acquisition.SyslogSource{} }, + iface: func() DataSource { return &fileacquisition.FileSource{} }, }, { name: "journalctl", diff --git a/pkg/acquisition/modules/file/file.go b/pkg/acquisition/modules/file/file.go index fc92ce966..9b3f78d51 100644 --- a/pkg/acquisition/modules/file/file.go +++ b/pkg/acquisition/modules/file/file.go @@ -1,4 +1,4 @@ -package file_acquisition +package fileacquisition import ( "bufio" diff --git a/pkg/acquisition/modules/file/file_reader_test.go b/pkg/acquisition/modules/file/file_reader_test.go index de68710b4..56260b250 100644 --- a/pkg/acquisition/modules/file/file_reader_test.go +++ b/pkg/acquisition/modules/file/file_reader_test.go @@ -1,4 +1,4 @@ -package file_acquisition +package fileacquisition import ( "os"