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

watchdog

Browse source
This commit is contained in:
marco 2024-02-26 16:22:59 +01:00
parent 33674a1617
commit 39e6657cf3
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
cmd/crowdsec/serve.go
View file

@ -1,6 +1,7 @@
package main package main
import ( import (
"context"
"fmt" "fmt"
"os" "os"
"os/signal" "os/signal"
@ -239,6 +240,22 @@ func drainChan(c chan types.Event) {
} }
} }
// watchdog sends a watchdog signal to systemd every 15 seconds
func watchdog(ctx context.Context, logger log.FieldLogger) {
ticker := time.NewTicker(15 * time.Second)
defer ticker.Stop()
for {
select {
case <-ctx.Done():
return
case <-ticker.C:
csdaemon.Notify(csdaemon.Watchdog, logger)
}
}
}
func HandleSignals(cConfig *csconfig.Config) error { func HandleSignals(cConfig *csconfig.Config) error {
var ( var (
newConfig *csconfig.Config newConfig *csconfig.Config
@ -263,14 +280,21 @@ func HandleSignals(cConfig *csconfig.Config) error {
go func() { go func() {
defer trace.CatchPanic("crowdsec/HandleSignals") defer trace.CatchPanic("crowdsec/HandleSignals")
csdaemon.Notify(csdaemon.Ready, log.StandardLogger()) logger := log.StandardLogger()
csdaemon.Notify(csdaemon.Ready, logger)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
go watchdog(ctx, logger)
for s := range signalChan { for s := range signalChan {
switch s { switch s {
// kill -SIGHUP XXXX // kill -SIGHUP XXXX
case syscall.SIGHUP: case syscall.SIGHUP:
log.Warning("SIGHUP received, reloading") log.Warning("SIGHUP received, reloading")
csdaemon.Notify(csdaemon.Reloading, log.StandardLogger()) csdaemon.Notify(csdaemon.Reloading, logger)
if err = shutdown(cConfig); err != nil { if err = shutdown(cConfig); err != nil {
exitChan <- fmt.Errorf("failed shutdown: %w", err) exitChan <- fmt.Errorf("failed shutdown: %w", err)
@ -288,7 +312,7 @@ func HandleSignals(cConfig *csconfig.Config) error {
// ctrl+C, kill -SIGINT XXXX, kill -SIGTERM XXXX // ctrl+C, kill -SIGINT XXXX, kill -SIGTERM XXXX
case os.Interrupt, syscall.SIGTERM: case os.Interrupt, syscall.SIGTERM:
log.Warning("SIGTERM received, shutting down") log.Warning("SIGTERM received, shutting down")
csdaemon.Notify(csdaemon.Stopping, log.StandardLogger()) csdaemon.Notify(csdaemon.Stopping, logger)
if err = shutdown(cConfig); err != nil { if err = shutdown(cConfig); err != nil {
exitChan <- fmt.Errorf("failed shutdown: %w", err) exitChan <- fmt.Errorf("failed shutdown: %w", err)

1
config/crowdsec.service
View file

@ -12,6 +12,7 @@ ExecReload=/usr/local/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
Restart=always Restart=always
RestartSec=60 RestartSec=60
WatchdogSec=30
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
debian/crowdsec.service vendored
View file

@ -12,6 +12,7 @@ ExecReload=/usr/bin/crowdsec -c /etc/crowdsec/config.yaml -t -error
ExecReload=/bin/kill -HUP $MAINPID ExecReload=/bin/kill -HUP $MAINPID
Restart=always Restart=always
RestartSec=60 RestartSec=60
WatchdogSec=30
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target