Skip to content

refact cmd/crowdsec: remove redundant global variable #4299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmetc merged 1 commit into from
Feb 12, 2026
+12 −11
Merged

refact cmd/crowdsec: remove redundant global variable #4299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/crowdsec/crowdsec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func startLPMetrics(ctx context.Context, cConfig *csconfig.Config, apiClient *ap
aggregated = true
}

if err := acquisition.GetMetrics(dataSources, aggregated); err != nil {
if err := acquisition.GetMetrics(datasources, aggregated); err != nil {
return fmt.Errorf("while fetching prometheus metrics for datasources: %w", err)
}
}
Expand Down Expand Up @@ -167,7 +167,7 @@ func runCrowdsec(

log.Info("Starting processing data")

if err := acquisition.StartAcquisition(ctx, dataSources, logLines, &acquisTomb); err != nil {
if err := acquisition.StartAcquisition(ctx, datasources, logLines, &acquisTomb); err != nil {
return fmt.Errorf("starting acquisition error: %w", err)
}

Expand Down Expand Up @@ -212,7 +212,7 @@ func serveCrowdsec(
waitOnTomb()
log.Debugf("Shutting down crowdsec routines")

if err := ShutdownCrowdsecRoutines(cancel, &g); err != nil {
if err := ShutdownCrowdsecRoutines(cancel, &g, datasources); err != nil {
return fmt.Errorf("unable to shutdown crowdsec routines: %w", err)
}

Expand Down
12 changes: 6 additions & 6 deletions cmd/crowdsec/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ var (

flags Flags

// the state of acquisition
dataSources []acquisitionTypes.DataSource
// the state of the buckets
holders []leakybucket.BucketFactory

Expand All @@ -66,27 +64,29 @@ func LoadBuckets(cConfig *csconfig.Config, hub *cwhub.Hub) error {
}

func LoadAcquisition(ctx context.Context, cConfig *csconfig.Config, hub *cwhub.Hub) ([]acquisitionTypes.DataSource, error) {
var datasources []acquisitionTypes.DataSource

if flags.SingleFileType != "" && flags.OneShotDSN != "" {
flags.Labels["type"] = flags.SingleFileType

ds, err := acquisition.LoadAcquisitionFromDSN(ctx, flags.OneShotDSN, flags.Labels, flags.Transform, hub)
if err != nil {
return nil, err
}
dataSources = append(dataSources, ds)
datasources = append(datasources, ds)
} else {
dss, err := acquisition.LoadAcquisitionFromFiles(ctx, cConfig.Crowdsec, cConfig.Prometheus, hub)
if err != nil {
return nil, err
}
dataSources = dss
datasources = dss
}

if len(dataSources) == 0 {
if len(datasources) == 0 {
return nil, errors.New("no datasource enabled")
}

return dataSources, nil
return datasources, nil
}

// LoadConfig returns a configuration parsed from configuration file
Expand Down
5 changes: 3 additions & 2 deletions cmd/crowdsec/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/crowdsecurity/go-cs-lib/csdaemon"
"github.com/crowdsecurity/go-cs-lib/trace"

acquisitionTypes "github.com/crowdsecurity/crowdsec/pkg/acquisition/types"
"github.com/crowdsecurity/crowdsec/pkg/apiclient"
"github.com/crowdsecurity/crowdsec/pkg/csconfig"
"github.com/crowdsecurity/crowdsec/pkg/cticlient/ctiexpr"
Expand Down Expand Up @@ -99,12 +100,12 @@ func waitErrGroup(g *errgroup.Group, timeout time.Duration) error {
}
}

func ShutdownCrowdsecRoutines(cancel context.CancelFunc, g *errgroup.Group) error {
func ShutdownCrowdsecRoutines(cancel context.CancelFunc, g *errgroup.Group, datasources []acquisitionTypes.DataSource) error {
var reterr error

log.Debugf("Shutting down crowdsec sub-routines")

if len(dataSources) > 0 {
if len(datasources) > 0 {
acquisTomb.Kill(nil)
log.Debugf("waiting for acquisition to finish")
drainChan(logLines)
Expand Down