This commit is contained in:
AlteredCoder 2020-06-18 13:00:42 +02:00
parent 6799f7cb66
commit 43497e8e8c

View file

@ -242,7 +242,6 @@ func main() {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
if cConfig.Daemonize {
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) daemon.SetSigHandler(debugHandler, syscall.SIGUSR1)
@ -254,14 +253,15 @@ func main() {
Umask: 027, Umask: 027,
} }
if cConfig.Daemonize {
d, err := daemonCTX.Reborn() d, err := daemonCTX.Reborn()
log.Printf("D : %+v \n", d)
if err != nil { if err != nil {
log.Fatalf("unable to run daemon: %s ", err.Error()) log.Fatalf("unable to run daemon: %s ", err.Error())
} }
if d != nil { if d != nil {
return return
} }
defer daemonCTX.Release() //nolint:errcheck // won't bother checking this error in defer statement
} }
@ -334,6 +334,7 @@ func main() {
return return
} }
} else { } else {
defer daemonCTX.Release() //nolint:errcheck // won't bother checking this error in defer statement
err = daemon.ServeSignals() err = daemon.ServeSignals()
if err != nil { if err != nil {
log.Fatalf("serveDaemon error : %s", err.Error()) log.Fatalf("serveDaemon error : %s", err.Error())