@@ -287,8 +287,9 @@ func (d *DockerSource) SupportedModes() []string {
287287
288288// OneShotAcquisition reads a set of file and returns when done
289289func (d * DockerSource ) OneShotAcquisition (out chan types.Event , t * tomb.Tomb ) error {
290+ ctx := context .TODO ()
290291 d .logger .Debug ("In oneshot" )
291- runningContainer , err := d .Client .ContainerList (context . Background () , dockerTypes.ContainerListOptions {})
292+ runningContainer , err := d .Client .ContainerList (ctx , dockerTypes.ContainerListOptions {})
292293 if err != nil {
293294 return err
294295 }
@@ -298,10 +299,10 @@ func (d *DockerSource) OneShotAcquisition(out chan types.Event, t *tomb.Tomb) er
298299 d .logger .Debugf ("container with id %s is already being read from" , container .ID )
299300 continue
300301 }
301- if containerConfig := d .EvalContainer (container ); containerConfig != nil {
302+ if containerConfig := d .EvalContainer (ctx , container ); containerConfig != nil {
302303 d .logger .Infof ("reading logs from container %s" , containerConfig .Name )
303304 d .logger .Debugf ("logs options: %+v" , * d .containerLogsOptions )
304- dockerReader , err := d .Client .ContainerLogs (context . Background () , containerConfig .ID , * d .containerLogsOptions )
305+ dockerReader , err := d .Client .ContainerLogs (ctx , containerConfig .ID , * d .containerLogsOptions )
305306 if err != nil {
306307 d .logger .Errorf ("unable to read logs from container: %+v" , err )
307308 return err
@@ -372,26 +373,26 @@ func (d *DockerSource) CanRun() error {
372373 return nil
373374}
374375
375- func (d * DockerSource ) getContainerTTY (containerId string ) bool {
376- containerDetails , err := d .Client .ContainerInspect (context . Background () , containerId )
376+ func (d * DockerSource ) getContainerTTY (ctx context. Context , containerId string ) bool {
377+ containerDetails , err := d .Client .ContainerInspect (ctx , containerId )
377378 if err != nil {
378379 return false
379380 }
380381 return containerDetails .Config .Tty
381382}
382383
383- func (d * DockerSource ) getContainerLabels (containerId string ) map [string ]interface {} {
384- containerDetails , err := d .Client .ContainerInspect (context . Background () , containerId )
384+ func (d * DockerSource ) getContainerLabels (ctx context. Context , containerId string ) map [string ]interface {} {
385+ containerDetails , err := d .Client .ContainerInspect (ctx , containerId )
385386 if err != nil {
386387 return map [string ]interface {}{}
387388 }
388389 return parseLabels (containerDetails .Config .Labels )
389390}
390391
391- func (d * DockerSource ) EvalContainer (container dockerTypes.Container ) * ContainerConfig {
392+ func (d * DockerSource ) EvalContainer (ctx context. Context , container dockerTypes.Container ) * ContainerConfig {
392393 for _ , containerID := range d .Config .ContainerID {
393394 if containerID == container .ID {
394- return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : d .Config .Labels , Tty : d .getContainerTTY (container .ID )}
395+ return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : d .Config .Labels , Tty : d .getContainerTTY (ctx , container .ID )}
395396 }
396397 }
397398
@@ -401,27 +402,27 @@ func (d *DockerSource) EvalContainer(container dockerTypes.Container) *Container
401402 name = name [1 :]
402403 }
403404 if name == containerName {
404- return & ContainerConfig {ID : container .ID , Name : name , Labels : d .Config .Labels , Tty : d .getContainerTTY (container .ID )}
405+ return & ContainerConfig {ID : container .ID , Name : name , Labels : d .Config .Labels , Tty : d .getContainerTTY (ctx , container .ID )}
405406 }
406407 }
407408 }
408409
409410 for _ , cont := range d .compiledContainerID {
410411 if matched := cont .MatchString (container .ID ); matched {
411- return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : d .Config .Labels , Tty : d .getContainerTTY (container .ID )}
412+ return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : d .Config .Labels , Tty : d .getContainerTTY (ctx , container .ID )}
412413 }
413414 }
414415
415416 for _ , cont := range d .compiledContainerName {
416417 for _ , name := range container .Names {
417418 if matched := cont .MatchString (name ); matched {
418- return & ContainerConfig {ID : container .ID , Name : name , Labels : d .Config .Labels , Tty : d .getContainerTTY (container .ID )}
419+ return & ContainerConfig {ID : container .ID , Name : name , Labels : d .Config .Labels , Tty : d .getContainerTTY (ctx , container .ID )}
419420 }
420421 }
421422 }
422423
423424 if d .Config .UseContainerLabels {
424- parsedLabels := d .getContainerLabels (container .ID )
425+ parsedLabels := d .getContainerLabels (ctx , container .ID )
425426 if len (parsedLabels ) == 0 {
426427 d .logger .Tracef ("container has no 'crowdsec' labels set, ignoring container: %s" , container .ID )
427428 return nil
@@ -458,13 +459,13 @@ func (d *DockerSource) EvalContainer(container dockerTypes.Container) *Container
458459 }
459460 d .logger .Errorf ("label %s is not a string" , k )
460461 }
461- return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : labels , Tty : d .getContainerTTY (container .ID )}
462+ return & ContainerConfig {ID : container .ID , Name : container .Names [0 ], Labels : labels , Tty : d .getContainerTTY (ctx , container .ID )}
462463 }
463464
464465 return nil
465466}
466467
467- func (d * DockerSource ) WatchContainer (monitChan chan * ContainerConfig , deleteChan chan * ContainerConfig ) error {
468+ func (d * DockerSource ) WatchContainer (ctx context. Context , monitChan chan * ContainerConfig , deleteChan chan * ContainerConfig ) error {
468469 ticker := time .NewTicker (d .CheckIntervalDuration )
469470 d .logger .Infof ("Container watcher started, interval: %s" , d .CheckIntervalDuration .String ())
470471 for {
@@ -475,7 +476,7 @@ func (d *DockerSource) WatchContainer(monitChan chan *ContainerConfig, deleteCha
475476 case <- ticker .C :
476477 // to track for garbage collection
477478 runningContainersID := make (map [string ]bool )
478- runningContainer , err := d .Client .ContainerList (context . Background () , dockerTypes.ContainerListOptions {})
479+ runningContainer , err := d .Client .ContainerList (ctx , dockerTypes.ContainerListOptions {})
479480 if err != nil {
480481 if strings .Contains (strings .ToLower (err .Error ()), "cannot connect to the docker daemon at" ) {
481482 for idx , container := range d .runningContainerState {
@@ -501,7 +502,7 @@ func (d *DockerSource) WatchContainer(monitChan chan *ContainerConfig, deleteCha
501502 if _ , ok := d .runningContainerState [container .ID ]; ok {
502503 continue
503504 }
504- if containerConfig := d .EvalContainer (container ); containerConfig != nil {
505+ if containerConfig := d .EvalContainer (ctx , container ); containerConfig != nil {
505506 monitChan <- containerConfig
506507 }
507508 }
@@ -524,10 +525,10 @@ func (d *DockerSource) StreamingAcquisition(ctx context.Context, out chan types.
524525 deleteChan := make (chan * ContainerConfig )
525526 d .logger .Infof ("Starting docker acquisition" )
526527 t .Go (func () error {
527- return d .DockerManager (monitChan , deleteChan , out )
528+ return d .DockerManager (ctx , monitChan , deleteChan , out )
528529 })
529530
530- return d .WatchContainer (monitChan , deleteChan )
531+ return d .WatchContainer (ctx , monitChan , deleteChan )
531532}
532533
533534func (d * DockerSource ) Dump () interface {} {
@@ -541,9 +542,9 @@ func ReadTailScanner(scanner *bufio.Scanner, out chan string, t *tomb.Tomb) erro
541542 return scanner .Err ()
542543}
543544
544- func (d * DockerSource ) TailDocker (container * ContainerConfig , outChan chan types.Event , deleteChan chan * ContainerConfig ) error {
545+ func (d * DockerSource ) TailDocker (ctx context. Context , container * ContainerConfig , outChan chan types.Event , deleteChan chan * ContainerConfig ) error {
545546 container .logger .Infof ("start tail for container %s" , container .Name )
546- dockerReader , err := d .Client .ContainerLogs (context . Background () , container .ID , * d .containerLogsOptions )
547+ dockerReader , err := d .Client .ContainerLogs (ctx , container .ID , * d .containerLogsOptions )
547548 if err != nil {
548549 container .logger .Errorf ("unable to read logs from container: %+v" , err )
549550 return err
@@ -601,7 +602,7 @@ func (d *DockerSource) TailDocker(container *ContainerConfig, outChan chan types
601602 }
602603}
603604
604- func (d * DockerSource ) DockerManager (in chan * ContainerConfig , deleteChan chan * ContainerConfig , outChan chan types.Event ) error {
605+ func (d * DockerSource ) DockerManager (ctx context. Context , in chan * ContainerConfig , deleteChan chan * ContainerConfig , outChan chan types.Event ) error {
605606 d .logger .Info ("DockerSource Manager started" )
606607 for {
607608 select {
@@ -610,7 +611,7 @@ func (d *DockerSource) DockerManager(in chan *ContainerConfig, deleteChan chan *
610611 newContainer .t = & tomb.Tomb {}
611612 newContainer .logger = d .logger .WithField ("container_name" , newContainer .Name )
612613 newContainer .t .Go (func () error {
613- return d .TailDocker (newContainer , outChan , deleteChan )
614+ return d .TailDocker (ctx , newContainer , outChan , deleteChan )
614615 })
615616 d .runningContainerState [newContainer .ID ] = newContainer
616617 }
0 commit comments