From b876de55f910d1d47a5b38de74d8bdee87cc31f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rasmussen?= Date: Sun, 6 Mar 2022 23:13:00 +0100 Subject: [PATCH] Change deferred function call order --- cmd/fermentord/main.go | 8 +++----- internal/controllers/chamber.go | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/fermentord/main.go b/cmd/fermentord/main.go index c452161..70a5d89 100644 --- a/cmd/fermentord/main.go +++ b/cmd/fermentord/main.go @@ -23,10 +23,9 @@ import ( ) func mainLoop(ctx context.Context, wg *sync.WaitGroup, js nats.JetStream, config *controllers.ControllerConfig) { - defer wg.Done() - hub := sentry.CurrentHub().Clone() defer hub.Flush(10 * time.Second) + defer wg.Done() temperature.Initialize() @@ -181,16 +180,15 @@ func main() { wg.Add(1) go shutdownHTTP(ctxb, wg, srv) shutdown() - nc.Close() wg.Wait() + nc.Close() log.Print("Shutdown complete") } func shutdownHTTP(ctx context.Context, wg *sync.WaitGroup, srv *http.Server) { - defer wg.Done() - hub := sentry.CurrentHub().Clone() defer hub.Flush(10 * time.Second) + defer wg.Done() ctx2, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() diff --git a/internal/controllers/chamber.go b/internal/controllers/chamber.go index 8069e9f..99f8e76 100644 --- a/internal/controllers/chamber.go +++ b/internal/controllers/chamber.go @@ -62,8 +62,8 @@ func NewChamberController(name string, config ControllerConfig, chTemp <-chan te } func (p *ChamberController) Run(ctx context.Context, wg *sync.WaitGroup) { - defer wg.Done() defer p.hub.Flush(10 * time.Second) + defer wg.Done() ticker := time.NewTicker(1 * time.Second)