feat(agent,tracker): move device worker init from tracker to agent

internal/agent/agent.go

@@ -15,8 +15,11 @@ import (
 	"sync"
 	"syscall"
 
+	deviceConfig "github.com/joshuar/go-hass-agent/internal/config"
+
 	"github.com/joshuar/go-hass-agent/internal/agent/config"
 	"github.com/joshuar/go-hass-agent/internal/agent/ui"
+	"github.com/joshuar/go-hass-agent/internal/device"
 	"github.com/joshuar/go-hass-agent/internal/tracker"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -83,33 +86,31 @@ func Run(options AgentOptions) {
 	go agent.registrationProcess(agentCtx, "", "", options.Register, options.Headless, registrationDone)
 
 	var workerWg sync.WaitGroup
-	trackerCh := make(chan *tracker.SensorTracker)
 	go func() {
 		<-registrationDone
-		if err := UpgradeConfig(agent.config); err != nil {
-			log.Warn().Err(err).Msg("Could not upgrade config.")
+		var err error
+		if err = UpgradeConfig(agent.config); err != nil {
+			log.Warn().Err(err).Msg("Could not start.")
+		}
+		if err = ValidateConfig(agent.config); err != nil {
+			log.Fatal().Err(err).Msg("Could not start.")
 		}
-		if err := ValidateConfig(agent.config); err != nil {
-			log.Fatal().Err(err).Msg("Invalid config. Cannot start.")
+		if agent.sensors, err = tracker.NewSensorTracker(agent); err != nil {
+			log.Fatal().Err(err).Msg("Could not start.")
 		}
-		// Start all the sensor workers as appropriate
+
+		sensorWorkers := deviceConfig.SensorWorkers()
+		sensorWorkers = append(sensorWorkers, device.ExternalIPUpdater)
+
 		workerWg.Add(1)
 		go func() {
-			agent.sensors = <-trackerCh
-			if agent.sensors == nil {
-				log.Fatal().Msg("Could not start sensor tracker.")
-			}
+			device.StartWorkers(agentCtx, sensorWorkers, agent.sensors)
 		}()
 		workerWg.Add(1)
 		go func() {
 			defer workerWg.Done()
 			agent.runNotificationsWorker(agentCtx, options)
 		}()
-		workerWg.Add(1)
-		go func() {
-			defer workerWg.Done()
-			tracker.RunSensorTracker(agentCtx, agent, trackerCh)
-		}()
 	}()
 	agent.handleSignals(cancelFunc)
 	agent.handleShutdown(agentCtx)

internal/tracker/tracker.go

@@ -12,8 +12,6 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/joshuar/go-hass-agent/internal/config"
-	"github.com/joshuar/go-hass-agent/internal/device"
 	"github.com/joshuar/go-hass-agent/internal/hass/api"
 	registry "github.com/joshuar/go-hass-agent/internal/tracker/registry/jsonFiles"
 	"github.com/rs/zerolog/log"
@@ -45,33 +43,22 @@ type SensorTracker struct {
 	mu          sync.RWMutex
 }
 
-func RunSensorTracker(ctx context.Context, agentConfig agent, trackerCh chan *SensorTracker) {
+func NewSensorTracker(agentConfig agent) (*SensorTracker, error) {
 	registryPath, err := agentConfig.StoragePath(registryStorageID)
 	if err != nil {
 		log.Warn().Err(err).
 			Msg("Path for sensor registry is not valid, using in-memory registry.")
 	}
 	db, err := registry.NewJsonFilesRegistry(registryPath)
 	if err != nil {
-		log.Error().Err(err).Msg("Unable to create a sensor tracker.")
-		close(trackerCh)
+		return nil, errors.New("unable to create a sensor tracker")
 	}
 	sensorTracker := &SensorTracker{
 		registry:    db,
 		sensor:      make(map[string]Sensor),
 		agentConfig: agentConfig,
 	}
-	trackerCh <- sensorTracker
-	var wg sync.WaitGroup
-	sensorWorkers := config.SensorWorkers()
-	sensorWorkers = append(sensorWorkers, device.ExternalIPUpdater)
-
-	wg.Add(1)
-	go func() {
-		device.StartWorkers(ctx, sensorWorkers, sensorTracker)
-	}()
-	wg.Wait()
-	close(trackerCh)
+	return sensorTracker, nil
 }
 
 // Add creates a new sensor in the tracker based on a recieved state update.