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

simplify, and only kill/wait on tomb when relevant (#866)

Browse source
This commit is contained in:
Thibault "bui" Koechlin 2021-07-23 11:09:56 +02:00 • committed by GitHub
parent c56581903c
commit 657b765021
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
cmd/crowdsec/serve.go
View file

@ -40,29 +40,6 @@ func debugHandler(sig os.Signal, cConfig *csconfig.Config) error {
func reloadHandler(sig os.Signal, cConfig *csconfig.Config) error {
var tmpFile string
var err error
//stop go routines
if !cConfig.DisableAgent {
if err := shutdownCrowdsec(); err != nil {
log.Fatalf("Failed to shut down crowdsec routines: %s", err)
}
if cConfig.Crowdsec != nil && cConfig.Crowdsec.BucketStateDumpDir != "" {
if tmpFile, err = leaky.DumpBucketsStateAt(time.Now(), cConfig.Crowdsec.BucketStateDumpDir, buckets); err != nil {
log.Fatalf("Failed dumping bucket state : %s", err)
}
}
if err := leaky.ShutdownAllBuckets(buckets); err != nil {
log.Fatalf("while shutting down routines : %s", err)
}
}
if !cConfig.DisableAPI {
if err := shutdownAPI(); err != nil {
log.Fatalf("Failed to shut down api routines: %s", err)
}
}
/*
re-init tombs
*/
@ -180,14 +157,19 @@ func shutdownCrowdsec() error {
return nil
}
func termHandler(sig os.Signal) error {
if err := shutdownCrowdsec(); err != nil {
log.Errorf("Error encountered while shutting down crowdsec: %s", err)
func shutdown(sig os.Signal, cConfig *csconfig.Config) error {
if !cConfig.DisableAgent {
if err := shutdownCrowdsec(); err != nil {
log.Errorf("Failed to shut down crowdsec: %s", err)
return err
}
}
if err := shutdownAPI(); err != nil {
log.Errorf("Error encountered while shutting down api: %s", err)
if !cConfig.DisableAPI {
if err := shutdownAPI(); err != nil {
log.Errorf("Failed to shut down api routines: %s", err)
return err
}
}
log.Debugf("termHandler done")
return nil
}
@ -206,14 +188,17 @@ func HandleSignals(cConfig *csconfig.Config) {
// kill -SIGHUP XXXX
case syscall.SIGHUP:
log.Warningf("SIGHUP received, reloading")
if err := shutdown(s, cConfig); err != nil {
log.Fatalf("failed shutdown : %s", err)
}
if err := reloadHandler(s, cConfig); err != nil {
log.Fatalf("Reload handler failure : %s", err)
}
// kill -SIGTERM XXXX
case syscall.SIGTERM:
log.Warningf("SIGTERM received, shutting down")
if err := termHandler(s); err != nil {
log.Fatalf("Term handler failure : %s", err)
if err := shutdown(s, cConfig); err != nil {
log.Fatalf("failed shutdown : %s", err)
}
exitChan <- 0
}