feat: add stderr and stdout to cron problem sensor attributes

Author: jcwillox

components/switches/cron.go

@@ -41,7 +41,8 @@ func NewCron(cfg CronConfig) []*entity.Entity {
 			Name(cfg.Name + " Successful").
 			ID(cfg.UniqueID + "_successful").
 			DeviceClass("problem").
-			DefaultStateTopic().Build()
+			DefaultStateTopic().
+			DefaultAttributesTopic().Build()
 		entities = append(entities, successEntity)
 	}
 
@@ -71,7 +72,6 @@ func NewCron(cfg CronConfig) []*entity.Entity {
 		Type(entity.DomainSwitch).
 		ObjectID(cfg.UniqueID).
 		ScheduleJob(gocron.CronJob(cfg.Schedule, true), func(entity *entity.Entity, client mqtt.Client, scheduler gocron.Scheduler) error {
-			log.Debug().Str("command", cfg.CommandConfig.Command).Msg("running command task")
 			start := time.Now()
 
 			// run command
@@ -97,6 +97,14 @@ func NewCron(cfg CronConfig) []*entity.Entity {
 					if err != nil {
 						return err
 					}
+					err = successEntity.PublishAttributes(client, map[string]interface{}{
+						"stdout": string(res.Stdout),
+						"stderr": string(res.Stderr),
+						"code":   res.Code,
+					})
+					if err != nil {
+						return err
+					}
 				}
 				if err != nil {
 					log.Err(err).Str("command", cfg.CommandConfig.Command).Msg("failed to run command")
@@ -108,6 +116,10 @@ func NewCron(cfg CronConfig) []*entity.Entity {
 					if err != nil {
 						return err
 					}
+					err = successEntity.PublishAttributes(client, map[string]string{})
+					if err != nil {
+						return err
+					}
 				}
 			}
 

utils/cmd.go

@@ -24,9 +24,9 @@ type CommandConfig struct {
 }
 
 type CommandResult struct {
-	Stdout []byte
-	Stderr []byte
-	Code   int
+	Stdout []byte `json:"stdout"`
+	Stderr []byte `json:"stderr"`
+	Code   int    `json:"code"`
 }
 
 func GetDefaultShell() []string {
@@ -79,15 +79,15 @@ func renderTemplate(command string) (string, error) {
 func RunCommand(cfg CommandConfig) (CommandResult, error) {
 	var args []string
 
-	log.Info().Str("command", cfg.Command).Str("shell", cfg.Shell).
+	log.Debug().Str("command", cfg.Command).Str("shell", cfg.Shell).
 		Interface("hidden", cfg.Hidden).Msg("running command")
 
 	command, err := renderTemplate(cfg.Command)
 	if err != nil {
 		return CommandResult{}, err
 	}
 
-	log.Info().Str("command", command).Msg("templated command")
+	log.Debug().Str("command", command).Msg("templated command")
 
 	if cfg.Shell == "none" {
 		cmdArgs, err := shlex.Split(command)