Add env to disable success message after job run

Author: flohoss

cmd/main.go

@@ -64,7 +64,7 @@ func main() {
 	}
 
 	c := scheduler.New()
-	n := notify.New(env.NtfyUrl, env.NtfyTopic, env.NtfyToken)
+	n := notify.New(env.NtfyUrl, env.NtfyTopic, env.NtfyToken, env.SendMessageOnSuccess)
 
 	js, err := services.NewJobService(configFolder+"db.sqlite", cfg, c, n)
 	if err != nil {

internal/env/env.go

@@ -10,12 +10,13 @@ import (
 )
 
 type Config struct {
-	TimeZone  string `env:"TZ" envDefault:"Etc/UTC" validate:"timezone"`
-	Port      int    `env:"PORT" envDefault:"8156" validate:"omitempty,numeric"`
-	LogLevel  string `env:"LOG_LEVEL" envDefault:"info" validate:"oneof=debug info warn error"`
-	NtfyUrl   string `env:"NTFY_URL" envDefault:"https://ntfy.sh/" validate:"omitempty,url,endswith=/"`
-	NtfyTopic string `env:"NTFY_TOPIC" envDefault:"gocron"`
-	NtfyToken string `env:"NTFY_TOKEN,unset"`
+	TimeZone             string `env:"TZ" envDefault:"Etc/UTC" validate:"timezone"`
+	Port                 int    `env:"PORT" envDefault:"8156" validate:"omitempty,numeric"`
+	LogLevel             string `env:"LOG_LEVEL" envDefault:"info" validate:"oneof=debug info warn error"`
+	NtfyUrl              string `env:"NTFY_URL" envDefault:"https://ntfy.sh/" validate:"omitempty,url,endswith=/"`
+	NtfyTopic            string `env:"NTFY_TOPIC" envDefault:"gocron"`
+	NtfyToken            string `env:"NTFY_TOKEN,unset"`
+	SendMessageOnSuccess bool   `env:"SEND_ON_SUCCESS" envDefault:"true" validate:"omitempty,boolean"`
 }
 
 var errParse = errors.New("error parsing environment variables")

internal/notify/notify.go

@@ -8,27 +8,59 @@ import (
 )
 
 type Notifier struct {
-	URL   string
-	Topic string
-	Token string
+	URL                  string
+	Topic                string
+	Token                string
+	SendMessageOnSuccess bool
 }
 
-func New(url, topic, token string) *Notifier {
+func New(url, topic, token string, sendMessageOnSuccess bool) *Notifier {
 	return &Notifier{
-		URL:   url,
-		Topic: topic,
-		Token: token,
+		URL:                  url,
+		Topic:                topic,
+		Token:                token,
+		SendMessageOnSuccess: sendMessageOnSuccess,
 	}
 }
 
-func (n *Notifier) Send(title, message string, tags []string) {
+type priorityLevel uint8
+
+const (
+	MIN priorityLevel = iota + 1
+	LOW
+	DEFAULT
+	HIGH
+	URGENT
+)
+
+func (p priorityLevel) String() string {
+	switch p {
+	case MIN:
+		return "min"
+	case LOW:
+		return "low"
+	case HIGH:
+		return "high"
+	case URGENT:
+		return "urgent"
+	default:
+		return "default"
+	}
+}
+
+func (n *Notifier) Send(title, message string, priority priorityLevel, tags []string) {
+	if !n.SendMessageOnSuccess {
+		return
+	}
+
 	req, _ := http.NewRequest("POST", n.URL+n.Topic, strings.NewReader(message))
 	req.Header.Set("Title", title)
-	req.Header.Set("Priority", "urgent")
+	req.Header.Set("Priority", priority.String())
 	req.Header.Set("Tags", strings.Join(tags, ","))
 	if n.Token != "" {
 		req.Header.Set("Authorization", "Bearer "+n.Token)
 	}
+
 	body, err := http.DefaultClient.Do(req)
 	if err != nil {
 		log.Errorf("Failed to send notification (url: %s, topic: %s): %v", n.URL, n.Topic, err)
@@ -39,5 +71,5 @@ func (n *Notifier) Send(title, message string, tags []string) {
 		log.Warnf("Failed to send notification (url: %s, topic: %s): %s", n.URL, n.Topic, body.Status)
 		return
 	}
-	log.Printf("Notification sent (url: %s, topic: %s)", n.URL, n.Topic)
+	log.Debugf("Notification sent (url: %s, topic: %s)", n.URL, n.Topic)
 }

services/jobs.go

@@ -229,7 +229,7 @@ func (js *JobService) ExecuteJobs(jobs []jobs.Job) {
 		js.ExecuteJob(&jobs[i])
 		names = append(names, jobs[i].Name)
 	}
-	js.Notify.Send("Backup finished", fmt.Sprintf("Time: %s\nJobs: %s", time.Now().Format(time.RFC1123), strings.Join(names, ", ")), []string{"tada"})
+	js.Notify.Send("Backup finished", fmt.Sprintf("Time: %s\nJobs: %s", time.Now().Format(time.RFC1123), strings.Join(names, ", ")), notify.DEFAULT, []string{"tada"})
 }
 
 func (js *JobService) ExecuteJob(job *jobs.Job) {
@@ -264,7 +264,7 @@ func (js *JobService) ExecuteJob(job *jobs.Job) {
 		severity = Info
 		if err != nil {
 			severity = Error
-			js.Notify.Send(fmt.Sprintf("Error - %s", job.Name), fmt.Sprintf("Command: \"%s\"\nResult: \"%s\"", cmd, out), []string{"rotating_light"})
+			js.Notify.Send(fmt.Sprintf("Error - %s", job.Name), fmt.Sprintf("Command: \"%s\"\nResult: \"%s\"", cmd, out), notify.URGENT, []string{"rotating_light"})
 		}
 		if out == "" {
 			out = "Done - No output"