Merge pull request #33 from ThomasObenaus/b/fix_race_condition

B/fix race condition

.gitignore

@@ -1,2 +1,6 @@
 
 coverage.out
+
+.idea/
+
+go-base.iml

health/monitor.go

@@ -130,7 +130,10 @@ func (m *Monitor) evaluateChecks(at time.Time) checkEvaluationResult {
  result.numErrors++
  logEvent = m.logger.Error()
  }
- logEvent.Err(err).Msgf("Check - '%s'", name)
+ logEvent.Err(err).
+ // don't propagate errors to alerting
+ Bool("no_alert",true).
+ Msgf("Check - '%s'", name)
  }
 
  if m.onCheckCallback != nil {

shutdown/shutdownHandler.go

@@ -18,6 +18,8 @@ type Handler struct {
 
  wg sync.WaitGroup
  orderedStopables []Stopable
+
+ mux *sync.Mutex
 }
 
 // InstallHandler installs a handler for syscall.SIGINT, syscall.SIGTERM
@@ -29,6 +31,7 @@ func InstallHandler(orderedStopables []Stopable, logger zerolog.Logger) *Handler
  logger: logger,
  isShutdownPending: atomic.NewBool(false),
  orderedStopables: make([]Stopable, 0),
+ mux: &sync.Mutex{},
  }
  handler.orderedStopables = append(handler.orderedStopables, orderedStopables...)
 
@@ -50,6 +53,8 @@ func (h *Handler) Register(stopable Stopable, front ...bool) {
  pushFront = front[0]
  }
 
+ h.mux.Lock()
+ defer h.mux.Unlock()
  if pushFront {
  h.orderedStopables = append([]Stopable{stopable}, h.orderedStopables...)
  } else {
@@ -67,6 +72,8 @@ func (h *Handler) shutdownHandler(shutdownChan <-chan os.Signal, logger zerolog.
  logger.Info().Msgf("Received %v. Shutting down...", s)
 
  // Stop all components
+ h.mux.Lock()
+ defer h.mux.Unlock()
  stop(h.orderedStopables, logger)
 }
 
@@ -78,12 +85,13 @@ func (h *Handler) WaitUntilSignal() {
 
 // stop calls Stop() on all Stopable in the list as they are ordered.
 func stop(orderedStopables []Stopable, logger zerolog.Logger) {
+
  for _, stopable := range orderedStopables {
  name := stopable.String()
  logger.Debug().Msgf("Stopping %s ...", name)
  err := stopable.Stop()
  if err != nil {
- logger.Error().Err(err).Msgf("Failed stopping '%s'", name)
+ logger.Error().Err(err).Bool("no_alert", true).Msgf("Failed stopping '%s'", name)
  continue
  }
  logger.Info().Msgf("%s stopped.", name)

shutdown/shutdownHandler_test.go

@@ -3,6 +3,7 @@ package shutdown
 import (
  "fmt"
  "os"
+ "sync"
  "testing"
  "time"
 
@@ -36,6 +37,7 @@ func Test_ShutdownHandler(t *testing.T) {
  h := Handler{
  orderedStopables: stopables,
  isShutdownPending: atomic.NewBool(false),
+ mux: &sync.Mutex{},
  }
  shutDownChan := make(chan os.Signal, 1)
 
@@ -71,6 +73,7 @@ func Test_RegisterFront(t *testing.T) {
  h := Handler{
  orderedStopables: make([]Stopable, 0),
  isShutdownPending: atomic.NewBool(false),
+ mux: &sync.Mutex{},
  }
  shutDownChan := make(chan os.Signal, 1)
 
@@ -111,6 +114,7 @@ func Test_RegisterBack(t *testing.T) {
  h := Handler{
  orderedStopables: make([]Stopable, 0),
  isShutdownPending: atomic.NewBool(false),
+ mux: &sync.Mutex{},
  }
  shutDownChan := make(chan os.Signal, 1)