Fix a couple of minor bugs: log issue creation on success, not failure; and return early if receiver creation fails.

free · free · commit 390d3ec9543a · 2018-05-19T11:31:26.000+02:00
diff --git a/cmd/jiralert/main.go b/cmd/jiralert/main.go
@@ -82,6 +82,7 @@ func main() {
 			r, err := jiralert.NewReceiver(conf, tmpl)
 			if err != nil {
 				errorHandler(w, http.StatusInternalServerError, err, conf.Name, &data)
+				return
 			}
 			if retry, err := r.Notify(&data); err != nil {
 				var status int
diff --git a/notify.go b/notify.go
@@ -104,7 +104,7 @@ func (r *Receiver) Notify(data *alertmanager.Data) (bool, error) {
 		return false, r.tmpl.err
 	}
 	retry, err = r.create(issue)
-	if err != nil {
+	if err == nil {
 		log.Infof("Issue created: key=%s ID=%s", issue.Key, issue.ID)
 	}
 	return retry, err

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ func main() {`
`82`	`82`	`r, err := jiralert.NewReceiver(conf, tmpl)`
`83`	`83`	`if err != nil {`
`84`	`84`	`errorHandler(w, http.StatusInternalServerError, err, conf.Name, &data)`
	`85`	`+ return`
`85`	`86`	`}`
`86`	`87`	`if retry, err := r.Notify(&data); err != nil {`
`87`	`88`	`var status int`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (r Receiver) Notify(data alertmanager.Data) (bool, error) {`
`104`	`104`	`return false, r.tmpl.err`
`105`	`105`	`}`
`106`	`106`	`retry, err = r.create(issue)`
`107`		`- if err != nil {`
	`107`	`+ if err == nil {`
`108`	`108`	`log.Infof("Issue created: key=%s ID=%s", issue.Key, issue.ID)`
`109`	`109`	`}`
`110`	`110`	`return retry, err`