From 76a80380e72a0d9dd341979c730b32f56c40f1ca Mon Sep 17 00:00:00 2001 From: "Thibault \"bui\" Koechlin" Date: Sun, 24 Oct 2021 11:07:45 +0200 Subject: [PATCH] don't wait on tomb if no datasources were started (#1019) --- cmd/crowdsec/serve.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/crowdsec/serve.go b/cmd/crowdsec/serve.go index 5c4207dbc..1e91e6a33 100644 --- a/cmd/crowdsec/serve.go +++ b/cmd/crowdsec/serve.go @@ -104,11 +104,13 @@ func ShutdownCrowdsecRoutines() error { var reterr error log.Debugf("Shutting down crowdsec sub-routines") - acquisTomb.Kill(nil) - log.Debugf("waiting for acquisition to finish") - if err := acquisTomb.Wait(); err != nil { - log.Warningf("Acquisition returned error : %s", err) - reterr = err + if len(dataSources) > 0 { + acquisTomb.Kill(nil) + log.Debugf("waiting for acquisition to finish") + if err := acquisTomb.Wait(); err != nil { + log.Warningf("Acquisition returned error : %s", err) + reterr = err + } } log.Debugf("acquisition is finished, wait for parser/bucket/ouputs.") parsersTomb.Kill(nil)