Skip to content
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

Jump to bottom

[postoverflow] dump after postoverflow so we can test within hubtest #2511

Merged
merged 3 commits into from
Nov 28, 2023
Merged

[postoverflow] dump after postoverflow so we can test within hubtest #2511

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6c2764
Add to dump after postoverflow so we can test within hubtest
LaurenceJJones Oct 3, 2023
98d5b4a
Merge branch 'master' into postoverflow_dump_later
LaurenceJJones Oct 30, 2023
8ce5219
Merge branch 'master' into postoverflow_dump_later
buixor Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions cmd/crowdsec/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,6 @@
}
break LOOP
case event := <-overflow:
//if the Alert is nil, it's to signal bucket is ready for GC, don't track this
if dumpStates && event.Overflow.Alert != nil {
if bucketOverflows == nil {
bucketOverflows = make([]types.Event, 0)
}
bucketOverflows = append(bucketOverflows, event)
}
/*if alert is empty and mapKey is present, the overflow is just to cleanup bucket*/
if event.Overflow.Alert == nil && event.Overflow.Mapkey != "" {
buckets.Bucket_map.Delete(event.Overflow.Mapkey)
Expand All @@ -163,6 +156,14 @@
return fmt.Errorf("postoverflow failed : %s", err)
}
log.Printf("%s", *event.Overflow.Alert.Message)
//if the Alert is nil, it's to signal bucket is ready for GC, don't track this
//dump after postoveflow processing to avoid missing whitelist info
if dumpStates && event.Overflow.Alert != nil {
if bucketOverflows == nil {
bucketOverflows = make([]types.Event, 0)
}
bucketOverflows = append(bucketOverflows, event)

Check warning on line 165 in cmd/crowdsec/output.go

View check run for this annotation

Codecov / codecov/patch

cmd/crowdsec/output.go#L162-L165 

Added lines #L162 - L165 were not covered by tests
}
if event.Overflow.Whitelisted {
log.Printf("[%s] is whitelisted, skip.", *event.Overflow.Alert.Message)
continue
Expand Down