style(linux): additonal debug message for sensor shutdown

joshuar · Dec 10, 2023 · 4e71b9f · 4e71b9f
1 parent b5566a0
commit 4e71b9f
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 36 deletions.
diff --git a/internal/agent/agent.go b/internal/agent/agent.go
@@ -302,7 +302,7 @@ func (agent *Agent) startWorkers(ctx context.Context) {
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		for s := range mergeSensorCh(ctx, outCh...) {
+		for s := range tracker.MergeSensorCh(ctx, outCh...) {
 			if err := agent.sensors.UpdateSensors(ctx, s); err != nil {
 				log.Error().Err(err).Msg("Could not update sensor.")
 			}
@@ -359,7 +359,7 @@ func (agent *Agent) runScripts(ctx context.Context) {
 	log.Debug().Msg("Starting cron scheduler for script sensors.")
 	c.Start()
 	go func() {
-		for s := range mergeSensorCh(ctx, outCh...) {
+		for s := range tracker.MergeSensorCh(ctx, outCh...) {
 			if err := agent.sensors.UpdateSensors(ctx, s); err != nil {
 				log.Error().Err(err).Msg("Could not update script sensor.")
 			}
@@ -370,33 +370,3 @@ func (agent *Agent) runScripts(ctx context.Context) {
 	cronCtx := c.Stop()
 	<-cronCtx.Done()
 }
-
-func mergeSensorCh(ctx context.Context, sensorCh ...<-chan tracker.Sensor) <-chan tracker.Sensor {
-	var wg sync.WaitGroup
-	out := make(chan tracker.Sensor)
-
-	// Start an output goroutine for each input channel in sensorCh.  output
-	// copies values from c to out until c is closed, then calls wg.Done.
-	output := func(c <-chan tracker.Sensor) {
-		defer wg.Done()
-		for n := range c {
-			select {
-			case out <- n:
-			case <-ctx.Done():
-				return
-			}
-		}
-	}
-	wg.Add(len(sensorCh))
-	for _, c := range sensorCh {
-		go output(c)
-	}
-
-	// Start a goroutine to close out once all the output goroutines are
-	// done.  This must start after the wg.Add call.
-	go func() {
-		wg.Wait()
-		close(out)
-	}()
-	return out
-}
diff --git a/internal/agent/device_linux.go b/internal/agent/device_linux.go
@@ -25,7 +25,7 @@ func sensorWorkers() []func(context.Context) chan tracker.Sensor {
 		linux.AppUpdater,
 		linux.NetworkConnectionsUpdater,
 		linux.NetworkStatsUpdater,
-		linux.PowerUpater,
+		linux.PowerProfileUpater,
 		linux.ProblemsUpdater,
 		linux.MemoryUpdater,
 		linux.LoadAvgUpdater,

diff --git a/internal/linux/appSensor.go b/internal/linux/appSensor.go
@@ -172,6 +172,7 @@ func AppUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped app sensor.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/batterySensor.go b/internal/linux/batterySensor.go
@@ -248,7 +248,7 @@ func (state *upowerBatteryState) Attributes() interface{} {
 }
 
 func BatteryUpdater(ctx context.Context) chan tracker.Sensor {
-	sensorCh := make(chan tracker.Sensor)
+	sensorCh := make(chan tracker.Sensor, 1)
 	batteryList := dbushelpers.NewBusRequest(ctx, dbushelpers.SystemBus).
 		Path(upowerDBusPath).
 		Destination(upowerDBusDest).
@@ -323,6 +323,7 @@ func BatteryUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped battery sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/diskSensor.go b/internal/linux/diskSensor.go
@@ -81,6 +81,7 @@ func DiskUsageUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped disk usage sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/loadavgSensor.go b/internal/linux/loadavgSensor.go
@@ -55,6 +55,7 @@ func LoadAvgUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped load average sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/memorySensor.go b/internal/linux/memorySensor.go
@@ -76,6 +76,7 @@ func MemoryUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped memory usage sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/networkConnectionSensor.go b/internal/linux/networkConnectionSensor.go
@@ -280,11 +280,12 @@ func monitorActiveConnections(ctx context.Context, sensorCh chan tracker.Sensor,
 }
 
 func NetworkConnectionsUpdater(ctx context.Context) chan tracker.Sensor {
-	sensorCh := make(chan tracker.Sensor)
+	sensorCh := make(chan tracker.Sensor, 1)
 	go getActiveConnections(ctx, sensorCh)
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped network connection state sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/networkStatsSensor.go b/internal/linux/networkStatsSensor.go
@@ -121,6 +121,7 @@ func NetworkStatsUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped network stats sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/powerSensor.go → internal/linux/powerProfileSensor.go b/internal/linux/powerSensor.go → internal/linux/powerProfileSensor.go
@@ -33,7 +33,7 @@ func newPowerSensor(t sensorType, v dbus.Variant) *powerSensor {
 	return s
 }
 
-func PowerUpater(ctx context.Context) chan tracker.Sensor {
+func PowerProfileUpater(ctx context.Context) chan tracker.Sensor {
 	sensorCh := make(chan tracker.Sensor, 1)
 	activePowerProfile, err := dbushelpers.NewBusRequest(ctx, dbushelpers.SystemBus).
 		Path(powerProfilesDBusPath).
@@ -86,6 +86,7 @@ func PowerUpater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg(("Stopped power profile sensor."))
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/powerStateSensor.go b/internal/linux/powerStateSensor.go
@@ -65,6 +65,7 @@ func PowerStateUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped power state sensor.")
 	}()
 	return sensorCh
 }

diff --git a/internal/linux/problemsSensor.go b/internal/linux/problemsSensor.go
@@ -101,6 +101,7 @@ func ProblemsUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped problems sensor.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/screenlockSensor.go b/internal/linux/screenlockSensor.go
@@ -82,6 +82,7 @@ func ScreenLockUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped screen lock sensor.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/tempSensor.go b/internal/linux/tempSensor.go
@@ -86,6 +86,7 @@ func TempUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped temp sensors.")
 	}()
 	return sensorCh
 }
diff --git a/internal/linux/timeSensor.go b/internal/linux/timeSensor.go
@@ -68,6 +68,7 @@ func TimeUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped time sensors.")
 	}()
 	return sensorCh
 }

diff --git a/internal/linux/usersSensor.go b/internal/linux/usersSensor.go
@@ -76,6 +76,7 @@ func UsersUpdater(ctx context.Context) chan tracker.Sensor {
 	go func() {
 		defer close(sensorCh)
 		<-ctx.Done()
+		log.Debug().Msg("Stopped users sensors.")
 	}()
 	return sensorCh
 }

diff --git a/internal/tracker/sensor.go b/internal/tracker/sensor.go
@@ -6,8 +6,10 @@
 package tracker
 
 import (
+	"context"
 	"fmt"
 	"strings"
+	"sync"
 
 	"github.com/joshuar/go-hass-agent/internal/hass/sensor"
 )
@@ -75,3 +77,33 @@ func marshalClass[C ComparableStringer](class C) string {
 		return class.String()
 	}
 }
+
+func MergeSensorCh(ctx context.Context, sensorCh ...<-chan Sensor) <-chan Sensor {
+	var wg sync.WaitGroup
+	out := make(chan Sensor)
+
+	// Start an output goroutine for each input channel in sensorCh.  output
+	// copies values from c to out until c is closed, then calls wg.Done.
+	output := func(c <-chan Sensor) {
+		defer wg.Done()
+		for n := range c {
+			select {
+			case out <- n:
+			case <-ctx.Done():
+				return
+			}
+		}
+	}
+	wg.Add(len(sensorCh))
+	for _, c := range sensorCh {
+		go output(c)
+	}
+
+	// Start a goroutine to close out once all the output goroutines are
+	// done.  This must start after the wg.Add call.
+	go func() {
+		wg.Wait()
+		close(out)
+	}()
+	return out
+}