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

ligten bucket logger (#2523)

Browse source
This commit is contained in:
Thibault "bui" Koechlin 2023-10-06 14:42:44 +02:00 committed by GitHub
parent 338141f067
commit 6c20d38c41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/leakybucket/bucket.go
View file

@ -216,7 +216,7 @@ func LeakRoutine(leaky *Leaky) error {
defer BucketsCurrentCount.With(prometheus.Labels{"name": leaky.Name}).Dec() defer BucketsCurrentCount.With(prometheus.Labels{"name": leaky.Name}).Dec()
/*todo : we create a logger at runtime while we want leakroutine to be up asap, might not be a good idea*/ /*todo : we create a logger at runtime while we want leakroutine to be up asap, might not be a good idea*/
leaky.logger = leaky.BucketConfig.logger.WithFields(log.Fields{"capacity": leaky.Capacity, "partition": leaky.Mapkey, "bucket_id": leaky.Uuid}) leaky.logger = leaky.BucketConfig.logger.WithFields(log.Fields{"partition": leaky.Mapkey, "bucket_id": leaky.Uuid})
//We copy the processors, as they are coming from the BucketFactory, and thus are shared between buckets //We copy the processors, as they are coming from the BucketFactory, and thus are shared between buckets
//If we don't copy, processors using local cache (such as Uniq) are subject to race conditions //If we don't copy, processors using local cache (such as Uniq) are subject to race conditions

2
pkg/leakybucket/manager_load.go
View file

@ -284,14 +284,12 @@ func LoadBucket(bucketFactory *BucketFactory, tomb *tomb.Tomb) error {
bucketFactory.logger = clog.WithFields(log.Fields{ bucketFactory.logger = clog.WithFields(log.Fields{
"cfg": bucketFactory.BucketName, "cfg": bucketFactory.BucketName,
"name": bucketFactory.Name, "name": bucketFactory.Name,
"file": bucketFactory.Filename,
}) })
} else { } else {
/* else bind it to the default one (might find something more elegant here)*/ /* else bind it to the default one (might find something more elegant here)*/
bucketFactory.logger = log.WithFields(log.Fields{ bucketFactory.logger = log.WithFields(log.Fields{
"cfg": bucketFactory.BucketName, "cfg": bucketFactory.BucketName,
"name": bucketFactory.Name, "name": bucketFactory.Name,
"file": bucketFactory.Filename,
}) })
} }