From 8c7822be97d9c94545f38c2ecb6d6de758132c37 Mon Sep 17 00:00:00 2001
From: Christopher Ramey <noreply@binarythought.com>
Date: Wed, 20 Jan 2021 18:49:32 -0900
Subject: [PATCH] refined alarm email, removed port requirement for smtp
 server, fixed bug with config loading

---
 alarm/alarm.go       |  2 +-
 alarm/alarm_email.go |  9 +++++++--
 alrmrc               |  2 +-
 main.go              | 22 ++++++++++++++++------
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/alarm/alarm.go b/alarm/alarm.go
index 4713907..4f288f5 100644
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -6,7 +6,7 @@ import (
 
 type Alarm interface {
 	Parse(string) (bool, error)
-	Alarm() error
+	Alarm(string,string,string,error) error
 }
 
 func NewAlarm(name string, typename string) (Alarm, error) {
diff --git a/alarm/alarm_email.go b/alarm/alarm_email.go
index 253a971..80df089 100644
--- a/alarm/alarm_email.go
+++ b/alarm/alarm_email.go
@@ -35,7 +35,7 @@ func NewAlarmEmail(name string) *AlarmEmail {
 	}
 }
 
-func (a *AlarmEmail) Alarm() error {
+func (a *AlarmEmail) Alarm(grp string, host string, chk string, cerr error) error {
 	c, err := smtp.Dial(a.SMTP)
 	if err != nil {
 		return err
@@ -68,7 +68,8 @@ func (a *AlarmEmail) Alarm() error {
 
 	msg := fmt.Sprintf("From: %s\r\n", a.From)
 	msg += fmt.Sprintf("To: %s\r\n", strings.Join(a.To, ";"))
-	msg += fmt.Sprintf("Subject: %s\r\n", "test subject")
+	msg += fmt.Sprintf("Subject: %s\r\n\r\n", "test subject")
+	msg += fmt.Sprintf("%s", cerr.Error())
 
 	_, err = fmt.Fprintf(m, "%s", msg)
 	if err != nil {
@@ -113,6 +114,10 @@ func (a *AlarmEmail) Parse(tk string) (bool, error) {
 		if strings.TrimSpace(tk) == "" {
 			return false, fmt.Errorf("smtp server cannot be empty")
 		}
+		// If the smtp host doesn't contain a port, add the default
+		if !strings.Contains(tk, ":") {
+			tk += ":25"
+		}
 		a.SMTP = tk
 		a.state = TK_NONE
 
diff --git a/alrmrc b/alrmrc
index eef47e3..1b426eb 100644
--- a/alrmrc
+++ b/alrmrc
@@ -3,7 +3,7 @@ set interval 30s
 alarm people email
 	to test1@localhost
 	to test2@localhost
-	smtp localhost:25
+	smtp localhost
 	from alrm@localhost
 
 monitor group webservers
diff --git a/main.go b/main.go
index 0adfde2..7a83ff3 100644
--- a/main.go
+++ b/main.go
@@ -16,12 +16,14 @@ func main() {
 	flag.Usage = printUsage
 	flag.Parse()
 
+
 	if *cfgPath == "" {
-		if _, err := os.Stat("./alrmrc"); err == nil {
-			*cfgPath = "./alrmrc"
-		}
-		if _, err := os.Stat("/etc/alrmrc"); err == nil {
-			*cfgPath = "/etc/alrmrc"
+		searchpaths := []string{"/etc/alrmrc", "./alrmrc"}
+		for _, sp := range searchpaths {
+			if _, err := os.Stat(sp); err == nil {
+				*cfgPath = sp
+				break
+			}
 		}
 		if *cfgPath == "" {
 			fmt.Fprintf(os.Stderr, "cannot find configuration\n")
@@ -32,12 +34,17 @@ func main() {
 	command := strings.ToLower(flag.Arg(0))
 	switch command {
 	case "config":
+		if *debuglvl > 0 {
+			fmt.Printf("checking config %s .. \n", *cfgPath)
+		}
+
 		cfg, err := config.ReadConfig(*cfgPath, *debuglvl)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 			os.Exit(1)
 		}
 
+
 		if *debuglvl > 0 {
 			o, err := json.MarshalIndent(cfg, "", "  ")
 			if err != nil {
@@ -68,7 +75,10 @@ func main() {
 			os.Exit(1)
 		}
 
-		err = al.Alarm()
+		err = al.Alarm(
+			"test group", "test host", "test check",
+			fmt.Errorf("test alarm message"),
+		)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "alarm failed: %s\n", err.Error())
 			os.Exit(1)