[fix] run multi sensors too :)

Author: rainu

cmd/mqtt-executor/main.go

@@ -58,7 +58,7 @@ func main() {
 
 	//register trigger and sensors
 	trigger.Initialise(byte(*Config.SubscribeQOS), byte(*Config.PublishQOS), Config.TopicConfigurations.Trigger)
-	sensorWorker.Initialise(byte(*Config.PublishQOS), Config.TopicConfigurations.Sensor)
+	sensorWorker.Initialise(byte(*Config.PublishQOS), Config.TopicConfigurations.Sensors())
 
 	// wait for interrupt
 	<-signals

internal/mqtt/config/topic.go

@@ -33,22 +33,25 @@ type Trigger struct {
 	Command Command `json:"command"`
 }
 
-type Sensor struct {
-	Name        string   `json:"name"`
+type GeneralSensor struct {
 	ResultTopic string   `json:"topic"`
 	Retained    bool     `json:"retained"`
 	Interval    Interval `json:"interval"`
-	Unit        string   `json:"unit"`
-	Icon        string   `json:"icon"`
 	Command     Command  `json:"command"`
 }
 
+type Sensor struct {
+	GeneralSensor
+
+	Name string `json:"name"`
+	Unit string `json:"unit"`
+	Icon string `json:"icon"`
+}
+
 type MultiSensor struct {
-	ResultTopic string             `json:"topic"`
-	Retained    bool               `json:"retained"`
-	Interval    Interval           `json:"interval"`
-	Command     Command            `json:"command"`
-	Values      []MultiSensorValue `json:"values"`
+	GeneralSensor
+
+	Values []MultiSensorValue `json:"values"`
 }
 
 type MultiSensorValue struct {
@@ -104,6 +107,17 @@ func LoadTopicConfiguration(configFilePath, deviceId string) (TopicConfiguration
 	return topicConfig, nil
 }
 
+func (t *TopicConfigurations) Sensors() []GeneralSensor {
+	sensors := make([]GeneralSensor, 0, len(t.Sensor)+len(t.MultiSensor))
+	for _, sensor := range t.Sensor {
+		sensors = append(sensors, sensor.GeneralSensor)
+	}
+	for _, sensor := range t.MultiSensor {
+		sensors = append(sensors, sensor.GeneralSensor)
+	}
+	return sensors
+}
+
 func (t *TopicConfigurations) validate() error {
 	if t.Availability != nil {
 		if err := checkTopicName(t.Availability.Topic); err != nil {

internal/mqtt/sensor.go

@@ -18,7 +18,7 @@ type SensorWorker struct {
 	MqttClient MQTT.Client
 }
 
-func (s *SensorWorker) Initialise(publishQOS byte, sensorConfigs []config.Sensor) {
+func (s *SensorWorker) Initialise(publishQOS byte, sensorConfigs []config.GeneralSensor) {
 
 	//generate a context so that we can cancel it later (see Close func)
 	var ctx context.Context
@@ -30,7 +30,7 @@ func (s *SensorWorker) Initialise(publishQOS byte, sensorConfigs []config.Sensor
 	}
 }
 
-func (s *SensorWorker) runSensor(ctx context.Context, publishQOS byte, sensorConf config.Sensor) {
+func (s *SensorWorker) runSensor(ctx context.Context, publishQOS byte, sensorConf config.GeneralSensor) {
 	defer s.waitGroup.Done()
 
 	//first execution
@@ -48,7 +48,7 @@ func (s *SensorWorker) runSensor(ctx context.Context, publishQOS byte, sensorCon
 	}
 }
 
-func (s *SensorWorker) executeCommand(ctx context.Context, publishQOS byte, sensorConf config.Sensor) {
+func (s *SensorWorker) executeCommand(ctx context.Context, publishQOS byte, sensorConf config.GeneralSensor) {
 	output, execErr := s.Executor.ExecuteCommandWithContext(sensorConf.Command.Name, sensorConf.Command.Arguments, ctx)
 	if execErr != nil {
 		s.MqttClient.Publish(sensorConf.ResultTopic, publishQOS, sensorConf.Retained, "<FAILED>;"+execErr.Error())