From cbaa9ba0c82bd8847177362eb156b66f041b5d45 Mon Sep 17 00:00:00 2001
From: Thibault bui Koechlin <thibault@crowdsec.net>
Date: Thu, 18 Jun 2020 14:33:19 +0200
Subject: [PATCH] signal handling

---
 cmd/crowdsec/main.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmd/crowdsec/main.go b/cmd/crowdsec/main.go
index 5f3fc4bf1..a4a7ee853 100644
--- a/cmd/crowdsec/main.go
+++ b/cmd/crowdsec/main.go
@@ -242,18 +242,18 @@ func main() {
 		log.Fatal(err.Error())
 	}
 
-	daemon.SetSigHandler(termHandler, syscall.SIGTERM)
-	daemon.SetSigHandler(reloadHandler, syscall.SIGHUP)
-	daemon.SetSigHandler(debugHandler, syscall.SIGUSR1)
-
-	daemonCTX := &daemon.Context{
-		PidFileName: cConfig.PIDFolder + "/crowdsec.pid",
-		PidFilePerm: 0644,
-		WorkDir:     "./",
-		Umask:       027,
-	}
-
 	if cConfig.Daemonize {
+		daemon.SetSigHandler(termHandler, syscall.SIGTERM)
+		daemon.SetSigHandler(reloadHandler, syscall.SIGHUP)
+		daemon.SetSigHandler(debugHandler, syscall.SIGUSR1)
+
+		daemonCTX := &daemon.Context{
+			PidFileName: cConfig.PIDFolder + "/crowdsec.pid",
+			PidFilePerm: 0644,
+			WorkDir:     "./",
+			Umask:       027,
+		}
+
 		d, err := daemonCTX.Reborn()
 		log.Printf("D : %+v \n", d)
 		if err != nil {
@@ -262,7 +262,7 @@ func main() {
 		if d != nil {
 			return
 		}
-
+		defer daemonCTX.Release()
 	}
 
 	log.Infof("Crowdsec %s", cwversion.VersionStr())