From 5a68d789ecd33dad8fd9e86445d29b302bb5019f Mon Sep 17 00:00:00 2001
From: Todd <github@quaddi.com>
Date: Wed, 7 Jun 2023 11:42:16 -0700
Subject: [PATCH] Initialize base context when creating New worker and not at
 start (#3294)

---
 internal/daemon/worker/worker.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go
index e074e0739d..0da5fd085c 100644
--- a/internal/daemon/worker/worker.go
+++ b/internal/daemon/worker/worker.go
@@ -188,7 +188,10 @@ func New(ctx context.Context, conf *Config) (*Worker, error) {
 	metric.InitializeClusterClientCollectors(conf.PrometheusRegisterer)
 	initializeReverseGrpcClientCollectors(conf.PrometheusRegisterer)
 
+	baseContext, baseCancel := context.WithCancel(context.Background())
 	w := &Worker{
+		baseContext:            baseContext,
+		baseCancel:             baseCancel,
 		conf:                   conf,
 		logger:                 conf.Logger.Named("worker"),
 		started:                ua.NewBool(false),
@@ -358,9 +361,6 @@ func (w *Worker) Reload(ctx context.Context, newConf *config.Config) {
 
 func (w *Worker) Start() error {
 	const op = "worker.(Worker).Start"
-
-	w.baseContext, w.baseCancel = context.WithCancel(context.Background())
-
 	if w.started.Load() {
 		event.WriteSysEvent(w.baseContext, op, "already started, skipping")
 		return nil