Changes to cron scheduler, adding logging for errors in alert task, u…

…pdating alert email
Danzabar · Nov 2, 2016 · 4807112 · 4807112
1 parent aac399a
commit 4807112
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/alert_task.go b/alert_task.go
@@ -86,7 +86,7 @@ func sendMail(t string, n []Notification, a []AlertGroup) {
 			// We don't want to update the notifications
 			// but we also don't want to kill the server
 			// with a panic.
-			log.Fatal(err)
+			log.Print(err)
 			return
 		}
 	}
@@ -99,7 +99,7 @@ func createEmailBody(n []Notification, t string) string {
 	buf.WriteString(fmt.Sprintf("<html><div><p>New notifications for the tag %s</p><ul>", t))
 
 	for _, v := range n {
-		buf.WriteString(fmt.Sprintf("<li>%s</li>", v.Message))
+		buf.WriteString(fmt.Sprintf("<li>%s (%s)- %s</li>", v.Message, v.Source, v.Action))
 	}
 
 	buf.WriteString("</ul><p>Do not reply to this email</p></div></html>")
@@ -112,6 +112,7 @@ func skipNotifications(n []Notification) {
 	for _, v := range n {
 		v.Read = true
 		if err := tx.Save(v).Error; err != nil {
+			log.Print(err)
 			tx.Rollback()
 		}
 	}
@@ -125,6 +126,7 @@ func updateNotifications(n []Notification) {
 	for _, v := range n {
 		v.Alerted = true
 		if err := tx.Save(&v).Error; err != nil {
+			log.Print(err)
 			tx.Rollback()
 		}
 	}

diff --git a/main.go b/main.go
@@ -18,10 +18,11 @@ func main() {
 	dbDriver := flag.String("driver", "sqlite3", "The database driver notify should use")
 	dbCreds := flag.String("creds", "/tmp/main.db", "The database credentials")
 	enableAlert := flag.Bool("a", false, "Enables the alerting schedule")
+	port := flag.String("port", ":8080", "Port on which the server runs")
 
 	flag.Parse()
 
-	App = NewApp(":8080", *dbDriver, *dbCreds)
+	App = NewApp(*port, *dbDriver, *dbCreds)
 
 	// Run Migrations
 	if *migrate {
@@ -31,7 +32,7 @@ func main() {
 
 	// Start the alert task schedule
 	if *enableAlert {
-		gocron.Every(5).Minutes().Do(SendAlerts)
+		gocron.Every(1).Minute().Do(SendAlerts)
 		<-gocron.Start()
 	}