improve shutdown

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

autopilot/main.go

@@ -37,6 +37,8 @@ type (
 			update *cron.Cron
 		}
 
+		wg sync.WaitGroup
+
 		prometheus struct {
 			general struct {
 				errors *prometheus.CounterVec
@@ -208,6 +210,18 @@ func (r *AzureK8sAutopilot) Start() {
 	}()
 }
 
+func (r *AzureK8sAutopilot) Stop() {
+	if r.cron.repair != nil {
+		r.cron.repair.Stop()
+	}
+
+	if r.cron.update != nil {
+		r.cron.update.Stop()
+	}
+
+	r.wg.Wait()
+}
+
 func (r *AzureK8sAutopilot) startAutopilotRepair() {
 	// repair job
 	r.cron.repair = cron.New(
@@ -221,6 +235,9 @@ func (r *AzureK8sAutopilot) startAutopilotRepair() {
 	)
 
 	_, err := r.cron.repair.AddFunc(r.Config.Repair.Crontab, func() {
+		r.wg.Add(1)
+		defer r.wg.Done()
+
 		contextLogger := log.WithField("job", "repair")
 
 		// concurrency repair limit
@@ -254,6 +271,9 @@ func (r *AzureK8sAutopilot) startAutopilotUpdate() {
 	)
 
 	_, err := r.cron.update.AddFunc(r.Config.Update.Crontab, func() {
+		r.wg.Add(1)
+		defer r.wg.Done()
+
 		contextLogger := log.WithField("job", "update")
 
 		// concurrency repair limit

main.go

@@ -9,9 +9,11 @@ import (
 	"github.com/webdevopos/azure-k8s-autopilot/config"
 	"net/http"
 	"os"
+	"os/signal"
 	"path"
 	"runtime"
 	"strings"
+	"syscall"
 )
 
 const (
@@ -34,14 +36,21 @@ func main() {
 	log.Infof("starting Azure K8S cluster autopilot v%s (%s; %s; by %v)", gitTag, gitCommit, runtime.Version(), Author)
 	log.Info(string(opts.GetJson()))
 
-	autorepair := autopilot.AzureK8sAutopilot{
+	pilot := autopilot.AzureK8sAutopilot{
 		Config: opts,
 	}
-	autorepair.Init()
-	autorepair.Start()
+	pilot.Init()
+	pilot.Start()
 
 	log.Infof("starting http server on %s", opts.ServerBind)
 	startHttpServer()
+
+	termChan := make(chan os.Signal)
+	signal.Notify(termChan, syscall.SIGINT, syscall.SIGTERM)
+	<-termChan
+	log.Info("shutdown signal received, trying to stop")
+	pilot.Stop()
+	log.Info("finished, terminating now")
 }
 
 // init argparser and parse/validate arguments
@@ -103,5 +112,7 @@ func startHttpServer() {
 	})
 
 	http.Handle("/metrics", promhttp.Handler())
-	log.Fatal(http.ListenAndServe(opts.ServerBind, nil))
+	go func() {
+		log.Fatal(http.ListenAndServe(opts.ServerBind, nil))
+	}()
 }