Maintenance: shutdown order

- Order of threads to shutdown (control then tickers then health etc.)
- Rely on closing channels instead of waitgroups
- Move exit logs from each package to the shutdown package
This commit is contained in:
Quentin McGaw
2021-05-11 22:24:32 +00:00
parent 5159c1dc83
commit cff5e693d2
17 changed files with 292 additions and 140 deletions

View File

@@ -5,14 +5,13 @@ import (
"errors"
"net"
"net/http"
"sync"
"time"
"github.com/qdm12/golibs/logging"
)
type Server interface {
Run(ctx context.Context, healthy chan<- bool, wg *sync.WaitGroup)
Run(ctx context.Context, healthy chan<- bool, done chan<- struct{})
}
type server struct {
@@ -32,23 +31,20 @@ func NewServer(address string, logger logging.Logger) Server {
}
}
func (s *server) Run(ctx context.Context, healthy chan<- bool, wg *sync.WaitGroup) {
defer wg.Done()
func (s *server) Run(ctx context.Context, healthy chan<- bool, done chan<- struct{}) {
defer close(done)
internalWg := &sync.WaitGroup{}
internalWg.Add(1)
go s.runHealthcheckLoop(ctx, healthy, internalWg)
loopDone := make(chan struct{})
go s.runHealthcheckLoop(ctx, healthy, loopDone)
server := http.Server{
Addr: s.address,
Handler: s.handler,
}
internalWg.Add(1)
serverDone := make(chan struct{})
go func() {
defer internalWg.Done()
defer close(serverDone)
<-ctx.Done()
s.logger.Warn("context canceled: shutting down server")
defer s.logger.Warn("server shut down")
const shutdownGraceDuration = 2 * time.Second
shutdownCtx, cancel := context.WithTimeout(context.Background(), shutdownGraceDuration)
defer cancel()
@@ -63,5 +59,6 @@ func (s *server) Run(ctx context.Context, healthy chan<- bool, wg *sync.WaitGrou
s.logger.Error(err)
}
internalWg.Wait()
<-loopDone
<-serverDone
}