Add Controller ID

metal-toolbox · Aug 6, 2024 · d29dee8 · d29dee8
1 parent 14e8f82
commit d29dee8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/internal/flipflop/flipflop.go b/internal/flipflop/flipflop.go
@@ -14,7 +14,6 @@ import (
 	rctypes "github.com/metal-toolbox/rivets/condition"
 	"github.com/sirupsen/logrus"
 	"go.hollow.sh/toolbox/events"
-	"go.hollow.sh/toolbox/events/registry"
 	"go.opentelemetry.io/otel"
 )
 
@@ -28,8 +27,8 @@ type flipflop struct {
 	cfg            *app.Configuration
 	stream         events.Stream
 	store          store.Repository
-	controllerID   registry.ControllerID // assigned when this worker registers itself
 	name           string
+	controllerID   string
 	facilityCode   string
 	dryrun         bool
 	faultInjection bool
@@ -96,6 +95,7 @@ func (f *flipflop) Run(ctx context.Context) {
 		ctrl.WithLogger(f.logger),
 		ctrl.WithConnectionTimeout(f.cfg.NatsOptions.ConnectTimeout),
 	)
+	f.controllerID = nats.ID()
 
 	err := nats.Connect(ctx)
 	if err != nil {

diff --git a/internal/worker/task_handler.go b/internal/worker/task_handler.go
@@ -13,7 +13,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sirupsen/logrus"
-	"go.hollow.sh/toolbox/events/registry"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -27,7 +26,7 @@ type TaskHandler struct {
 	bmc         device.Queryor
 }
 
-func NewTaskHandler(task *Task, server *model.Asset, publisher ctrl.Publisher, bmc device.Queryor, controllerID registry.ControllerID, logger *logrus.Logger) *TaskHandler {
+func NewTaskHandler(task *Task, server *model.Asset, publisher ctrl.Publisher, bmc device.Queryor, controllerID string, logger *logrus.Logger) *TaskHandler {
 	taskHandler := &TaskHandler{
 		server:    server,
 		task:      task,