Allow to cancel graceful shutdown

example/example.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"log"
+	"time"
 
 	goshutdowner "git.jlel.se/jlelse/go-shutdowner"
 )
@@ -13,10 +14,12 @@ func main() {
 
 	// Add a function to execute on shutdown
 	sd.Add(func() {
+		time.Sleep(5 * time.Second)
 		log.Println("Shutdown")
 	})
 
 	log.Println("Started")
+	log.Println("Print CTRL + C once to gracefully shutdown, twice to cancel execution")
 
 	// CTRL + C or otherwise interrupt the program
 

shutdown.go

@@ -1,6 +1,7 @@
 package goshutdowner
 
 import (
+	"context"
 	"os"
 	"os/signal"
 	"sync"
@@ -14,30 +15,62 @@ import (
 //	 log.Println("Shutting down")
 //  })
 type Shutdowner struct {
-	initialized bool
-	quit        chan os.Signal
-	funcs       []ShutdownFunc
-	wg          sync.WaitGroup
-	mutex       sync.RWMutex
+	initialized   bool
+	shutdown      bool
+	quit          chan os.Signal
+	funcs         []ShutdownFunc
+	wg            sync.WaitGroup
+	mutex         sync.Mutex
+	cancelContext context.Context
+	cancelFunc    context.CancelFunc
 }
 
 type ShutdownFunc func()
 
+// Internal method
+func (f ShutdownFunc) execute(c context.Context) {
+	done := false
+	// Execute ShutdownFunc in goroutine and set done = true
+	go func() {
+		f()
+		done = true
+	}()
+	for {
+		// Check if context canceled or ShutdownFunc finished
+		select {
+		case <-c.Done():
+			// Context canceled, return
+			return
+		default:
+			if done {
+				// ShutdownFunc finished, return
+				return
+			}
+			// Otherwise continue
+		}
+	}
+}
+
 // Internal method
 func (s *Shutdowner) init() {
+	// Check if already initialized
 	if s.initialized {
 		return
 	}
-	s.quit = make(chan os.Signal, 1)
+	// Initialize cancel context and signal channel
+	s.cancelContext, s.cancelFunc = context.WithCancel(context.Background())
+	s.quit = make(chan os.Signal, 2)
 	signal.Notify(s.quit,
 		os.Interrupt,
 		syscall.SIGINT,
 		syscall.SIGTERM, // e.g. Docker stop
 	)
 	go func() {
-		<-s.quit
-		s.Shutdown()
+		for range s.quit {
+			s.Shutdown()
+		}
 	}()
+	// Finished
 	s.initialized = true
 }
 
@@ -45,23 +78,30 @@ func (s *Shutdowner) init() {
 func (s *Shutdowner) Add(f ShutdownFunc) {
 	s.init()
 	s.mutex.Lock()
+	defer s.mutex.Unlock()
 	s.wg.Add(1)
 	s.funcs = append(s.funcs, f)
-	s.mutex.Unlock()
 }
 
 // Trigger shutdown directly
 func (s *Shutdowner) Shutdown() {
 	s.init()
-	s.mutex.RLock()
-	for _, f := range s.funcs {
-		go func(f func()) {
-			defer s.wg.Done()
-			f()
-		}(f)
+	s.mutex.Lock()
+	defer s.mutex.Unlock()
+	if !s.shutdown {
+		// First time shutdown is called
+		for _, f := range s.funcs {
+			go func(f ShutdownFunc) {
+				defer s.wg.Done()
+				f.execute(s.cancelContext)
+			}(f)
+		}
+		s.shutdown = true
+	} else {
+		// Second time shutdown is called
+		// Cancel graceful shutdown
+		s.cancelFunc()
 	}
-	s.mutex.RUnlock()
-	s.wg.Wait()
 }
 
 // Wait till all functions finished

shutdown_test.go

@@ -3,6 +3,7 @@ package goshutdowner
 import (
 	"os"
 	"testing"
+	"time"
 )
 
 func Test_shutdowner(t *testing.T) {
@@ -30,6 +31,7 @@ func Test_shutdowner(t *testing.T) {
 		var s Shutdowner
 		var testBool1 bool
 		s.Add(func() {
+			time.Sleep(1 * time.Second)
 			testBool1 = true
 		})
 		s.quit <- os.Interrupt
@@ -38,4 +40,36 @@ func Test_shutdowner(t *testing.T) {
 			t.Fail()
 		}
 	})
+	t.Run("Cancel shutdown", func(t *testing.T) {
+		var s Shutdowner
+		var testBool1 bool
+		s.Add(func() {
+			time.Sleep(10 * time.Second)
+			testBool1 = true
+		})
+		go func() {
+			time.Sleep(1 * time.Second)
+			s.Shutdown()
+		}()
+		s.ShutdownAndWait()
+		if testBool1 == true {
+			t.Fail()
+		}
+	})
+	t.Run("Cancel shutdown using signal", func(t *testing.T) {
+		var s Shutdowner
+		var testBool1 bool
+		s.Add(func() {
+			time.Sleep(10 * time.Second)
+			testBool1 = true
+		})
+		go func() {
+			time.Sleep(1 * time.Second)
+			s.quit <- os.Interrupt
+		}()
+		s.ShutdownAndWait()
+		if testBool1 == true {
+			t.Fail()
+		}
+	})
 }