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

adda routine to dump state

Browse source
This commit is contained in:
Thibault bui Koechlin 2020-06-17 19:27:50 +02:00
parent 8e6e17b8c0
commit 7856493afd
1 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cmd/crowdsec/serve.go
View file

@ -9,24 +9,47 @@ import (
"github.com/crowdsecurity/crowdsec/pkg/acquisition" "github.com/crowdsecurity/crowdsec/pkg/acquisition"
leaky "github.com/crowdsecurity/crowdsec/pkg/leakybucket" leaky "github.com/crowdsecurity/crowdsec/pkg/leakybucket"
"github.com/crowdsecurity/crowdsec/pkg/outputs" "github.com/crowdsecurity/crowdsec/pkg/outputs"
"github.com/crowdsecurity/crowdsec/pkg/types"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/sevlyar/go-daemon" "github.com/sevlyar/go-daemon"
) )
func reloadHandler(sig os.Signal) error { //to be removed
var bucketsState string = "buckets_state.json" func debugHandler(sig os.Signal) error {
var tmpFile string
var err error
//stop go routines //stop go routines
if err := ShutdownRoutines(); err != nil { if err := ShutdownRoutines(); err != nil {
log.Errorf("Failed to shut down routines: %s", err) log.Errorf("Failed to shut down routines: %s", err)
} }
//todo : properly stop acquis with the tail readers //todo : properly stop acquis with the tail readers
if err := leaky.DumpBucketsStateAt(bucketsState, time.Now(), buckets); err != nil { if tmpFile, err = leaky.DumpBucketsStateAt(time.Now(), buckets); err != nil {
log.Fatalf("Failed dumping bucket state : %s", err) log.Fatalf("Failed dumping bucket state : %s", err)
} }
if err := leaky.ShutdownAllBuckets(buckets); err != nil {
log.Errorf("while shutting down routines : %s", err)
}
log.Printf("shutdown is finished buckets are in %s", tmpFile)
return nil
}
func reloadHandler(sig os.Signal) error {
var tmpFile string
var err error
//stop go routines
if err := ShutdownRoutines(); err != nil {
log.Errorf("Failed to shut down routines: %s", err)
}
//todo : properly stop acquis with the tail readers
if tmpFile, err = leaky.DumpBucketsStateAt(time.Now(), buckets); err != nil {
log.Fatalf("Failed dumping bucket state : %s", err)
}
if err := leaky.ShutdownAllBuckets(buckets); err != nil {
log.Errorf("while shutting down routines : %s", err)
}
//close logs //close logs
types.LogOutput.Close() //types.LogOutput.Close()
//reload all and start processing again :) //reload all and start processing again :)
if err := LoadParsers(cConfig); err != nil { if err := LoadParsers(cConfig); err != nil {
@ -38,8 +61,8 @@ func reloadHandler(sig os.Signal) error {
} }
//restore bucket state //restore bucket state
log.Warningf("Restoring buckets state from %s", bucketsState) log.Warningf("Restoring buckets state from %s", tmpFile)
if err := leaky.LoadBucketsState(bucketsState, buckets, holders); err != nil { if err := leaky.LoadBucketsState(tmpFile, buckets, holders); err != nil {
return fmt.Errorf("unable to restore buckets : %s", err) return fmt.Errorf("unable to restore buckets : %s", err)
} }
@ -63,6 +86,10 @@ func reloadHandler(sig os.Signal) error {
acquisition.AcquisStartReading(acquisitionCTX, inputLineChan, &acquisTomb) acquisition.AcquisStartReading(acquisitionCTX, inputLineChan, &acquisTomb)
log.Printf("Reload is finished") log.Printf("Reload is finished")
//delete the tmp file, it's safe now :)
if err := os.Remove(tmpFile); err != nil {
log.Warningf("Failed to delete temp file (%s) : %s", tmpFile, err)
}
return nil return nil
} }
@ -114,6 +141,7 @@ func serveDaemon() error {
daemon.SetSigHandler(termHandler, syscall.SIGTERM) daemon.SetSigHandler(termHandler, syscall.SIGTERM)
daemon.SetSigHandler(reloadHandler, syscall.SIGHUP) daemon.SetSigHandler(reloadHandler, syscall.SIGHUP)
daemon.SetSigHandler(debugHandler, syscall.SIGUSR1)
daemonCTX = &daemon.Context{ daemonCTX = &daemon.Context{
PidFileName: cConfig.PIDFolder + "/crowdsec.pid", PidFileName: cConfig.PIDFolder + "/crowdsec.pid",