moved runId creation to k.GetRunID()

kolide · Oct 31, 2024 · 763b574 · 763b574
1 parent 5284a22
commit 763b574
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/launcher/launcher.go b/cmd/launcher/launcher.go
@@ -195,7 +195,7 @@ func runLauncher(ctx context.Context, cancel func(), multiSlogger, systemMultiSl
 	k := knapsack.New(stores, flagController, db, multiSlogger, systemMultiSlogger)
 
 	// Generate a new run ID
-	newRunID := ulid.New()
+	newRunID := k.GetRunID()
 	// Set the run ID in knapsack
 	k.SetRunID(newRunID)
 

diff --git a/ee/agent/knapsack/knapsack.go b/ee/agent/knapsack/knapsack.go
@@ -9,6 +9,7 @@ import (
 
 	"log/slog"
 
+	"github.com/kolide/kit/ulid"
 	"github.com/kolide/launcher/ee/agent/storage"
 	"github.com/kolide/launcher/ee/agent/types"
 	"github.com/kolide/launcher/ee/tuf"
@@ -71,6 +72,9 @@ func (k *knapsack) SetRunID(id string) {
 
 // GetRunID retrieves the run ID from the knapsack
 func (k *knapsack) GetRunID() string {
+	if runID == "" {
+		runID = ulid.New()
+	}
 	return runID
 }