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

refactor

Browse source
This commit is contained in:
Thibault bui Koechlin 2020-06-18 15:51:54 +02:00
parent 294023a682
commit ba8efda8e7
1 changed files with 4 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
cmd/crowdsec/serve.go
View file

@ -120,12 +120,10 @@ func ShutdownRoutines() error {
} }
func termHandler(sig os.Signal) error { func termHandler(sig os.Signal) error {
log.Warningf("Shutting down routines") log.Infof("Shutting down routines")
if err := ShutdownRoutines(); err != nil { if err := ShutdownRoutines(); err != nil {
log.Warningf("Error encountered while shutting down routines : %s", err) log.Errorf("Error encountered while shutting down routines : %s", err)
} }
log.Infof("ouputs is done")
dumpMetrics()
log.Warningf("all routines are done, bye.") log.Warningf("all routines are done, bye.")
return daemon.ErrStop return daemon.ErrStop
} }
@ -142,26 +140,9 @@ func serveOneTimeRun(outputRunner outputs.Output) error {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
// wait for the parser to parse all events // wait for the parser to parse all events
parsersTomb.Kill(nil) if err := ShutdownRoutines(); err != nil {
if err := parsersTomb.Wait(); err != nil { log.Errorf("failed shutting down routines : %s", err)
log.Warningf("parsers returned error : %s", err)
} }
log.Infof("parsers is done")
// wait for the bucket to pour all events
bucketsTomb.Kill(nil)
if err := bucketsTomb.Wait(); err != nil {
log.Warningf("buckets returned error : %s", err)
}
log.Infof("buckets is done")
// wait for output to output all event
outputsTomb.Kill(nil)
if err := outputsTomb.Wait(); err != nil {
log.Warningf("ouputs returned error : %s", err)
}
log.Infof("ouputs is done")
dumpMetrics() dumpMetrics()
outputRunner.Flush() outputRunner.Flush()
log.Warningf("all routines are done, bye.") log.Warningf("all routines are done, bye.")