BUG: Rework e5b3fbc patch with signal routine cleanup on reload

Author: dkorunic

cmd/dataplaneapi/main.go

@@ -205,6 +205,7 @@ func startServer(cfg *configuration.Configuration) (reload configuration.AtomicB
 		log.Info("HAProxy Data Plane API reloading")
 		reload.Store(true)
 		cfg.UnSubscribeAll()
+		cfg.StopSignalHandler()
 		dataplaneapi.ContextHandler.Cancel()
 		err := server.Shutdown()
 		if err != nil {

configuration/configuration.go

@@ -150,6 +150,8 @@ type Configuration struct {
 	Cmdline                AtomicString         `yaml:"-"`
 	MapSync                *MapSync             `yaml:"-"`
 	mutex                  sync.Mutex
+	shutdownSignal         chan os.Signal
+	reloadSignal           chan os.Signal
 }
 
 var (

configuration/signals.go

@@ -81,22 +81,32 @@ func (cn *ChanNotify) notify(numTry int) {
 }
 
 func (c *Configuration) InitSignalHandler() {
-	osSignals := make(chan os.Signal, 1)
-	signal.Notify(osSignals, syscall.SIGINT, syscall.SIGTERM)
+	c.shutdownSignal = make(chan os.Signal, 1)
+	signal.Notify(c.shutdownSignal, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
-		sig := <-osSignals
-		log.Print(sig)
-		c.Notify.Shutdown.Notify()
+		for sig := range c.shutdownSignal {
+			log.Debug("Received signal ", sig)
+			c.Notify.Shutdown.Notify()
+		}
 	}()
 
-	osSignals2 := make(chan os.Signal, 1)
-	signal.Notify(osSignals2, syscall.SIGHUP)
+	c.reloadSignal = make(chan os.Signal, 1)
+	signal.Notify(c.reloadSignal, syscall.SIGHUP)
 
 	go func() {
-		for {
-			<-osSignals2
+		for sig := range c.reloadSignal {
+			log.Debug("Received signal ", sig)
 			c.Notify.Reload.Notify()
 		}
 	}()
 }
+
+func (c *Configuration) StopSignalHandler() {
+	log.Debug("Unloading signal handler")
+	signal.Stop(c.shutdownSignal)
+	signal.Stop(c.reloadSignal)
+	signal.Ignore(syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+	close(c.shutdownSignal)
+	close(c.reloadSignal)
+}