simplify signal handler
This commit is contained in:
parent
0674a34ee8
commit
d40720e061
|
@ -23,7 +23,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
//nolint:deadcode,unused // debugHandler is kept as a dev convenience: it shuts down and serialize internal state
|
//nolint:deadcode,unused // debugHandler is kept as a dev convenience: it shuts down and serialize internal state
|
||||||
func debugHandler(sig os.Signal, cConfig *csconfig.Config) error {
|
func debugHandler(cConfig *csconfig.Config) error {
|
||||||
var (
|
var (
|
||||||
tmpFile string
|
tmpFile string
|
||||||
err error
|
err error
|
||||||
|
@ -48,7 +48,7 @@ func debugHandler(sig os.Signal, cConfig *csconfig.Config) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func reloadHandler(sig os.Signal) (*csconfig.Config, error) {
|
func reloadHandler() (*csconfig.Config, error) {
|
||||||
var tmpFile string
|
var tmpFile string
|
||||||
|
|
||||||
// re-initialize tombs
|
// re-initialize tombs
|
||||||
|
@ -206,7 +206,7 @@ func shutdownCrowdsec() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func shutdown(sig os.Signal, cConfig *csconfig.Config) error {
|
func shutdown(cConfig *csconfig.Config) error {
|
||||||
if !cConfig.DisableAgent {
|
if !cConfig.DisableAgent {
|
||||||
if err := shutdownCrowdsec(); err != nil {
|
if err := shutdownCrowdsec(); err != nil {
|
||||||
return fmt.Errorf("failed to shut down crowdsec: %w", err)
|
return fmt.Errorf("failed to shut down crowdsec: %w", err)
|
||||||
|
@ -262,24 +262,21 @@ func HandleSignals(cConfig *csconfig.Config) error {
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
defer trace.CatchPanic("crowdsec/HandleSignals")
|
defer trace.CatchPanic("crowdsec/HandleSignals")
|
||||||
Loop:
|
|
||||||
for {
|
for s := range signalChan {
|
||||||
s := <-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")
|
||||||
|
|
||||||
if err = shutdown(s, cConfig); err != nil {
|
if err = shutdown(cConfig); err != nil {
|
||||||
exitChan <- fmt.Errorf("failed shutdown: %w", err)
|
exitChan <- fmt.Errorf("failed shutdown: %w", err)
|
||||||
|
return
|
||||||
break Loop
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if newConfig, err = reloadHandler(s); err != nil {
|
if newConfig, err = reloadHandler(); err != nil {
|
||||||
exitChan <- fmt.Errorf("reload handler failure: %w", err)
|
exitChan <- fmt.Errorf("reload handler failure: %w", err)
|
||||||
|
return
|
||||||
break Loop
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if newConfig != nil {
|
if newConfig != nil {
|
||||||
|
@ -288,10 +285,9 @@ 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")
|
||||||
if err = shutdown(s, cConfig); err != nil {
|
if err = shutdown(cConfig); err != nil {
|
||||||
exitChan <- fmt.Errorf("failed shutdown: %w", err)
|
exitChan <- fmt.Errorf("failed shutdown: %w", err)
|
||||||
|
return
|
||||||
break Loop
|
|
||||||
}
|
}
|
||||||
exitChan <- nil
|
exitChan <- nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ func (m *crowdsec_winservice) Execute(args []string, r <-chan svc.ChangeRequest,
|
||||||
changes <- c.CurrentStatus
|
changes <- c.CurrentStatus
|
||||||
case svc.Stop, svc.Shutdown:
|
case svc.Stop, svc.Shutdown:
|
||||||
changes <- svc.Status{State: svc.StopPending}
|
changes <- svc.Status{State: svc.StopPending}
|
||||||
err := shutdown(nil, m.config)
|
err := shutdown(m.config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Error while shutting down: %s", err)
|
log.Errorf("Error while shutting down: %s", err)
|
||||||
// don't return, we still want to notify windows that we are stopped ?
|
// don't return, we still want to notify windows that we are stopped ?
|
||||||
|
|
Loading…
Reference in a new issue