fix(notifications): failed image upload should not stop notification

bergquist · bergquist · commit 2b6013ce8161 · 2016-11-21T09:47:59.000+01:00
closes grafana#6638
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
@@ -55,10 +55,8 @@ func (n *RootNotifier) Notify(context *EvalContext) error {
 		return nil
 	}
 
-	err = n.uploadImage(context)
-	if err != nil {
-		n.log.Error("Failed to upload alert panel image", "error", err)
-		return err
+	if err = n.uploadImage(context); err != nil {
+		n.log.Error("Failed to upload alert panel image.", "error", err)
 	}
 
 	return n.sendNotifications(context, notifiers)

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,8 @@ func (n RootNotifier) Notify(context EvalContext) error {`
`55`	`55`	`return nil`
`56`	`56`	`}`
`57`	`57`
`58`		`- err = n.uploadImage(context)`
`59`		`- if err != nil {`
`60`		`- n.log.Error("Failed to upload alert panel image", "error", err)`
`61`		`- return err`
	`58`	`+ if err = n.uploadImage(context); err != nil {`
	`59`	`+ n.log.Error("Failed to upload alert panel image.", "error", err)`
`62`	`60`	`}`
`63`	`61`
`64`	`62`	`return n.sendNotifications(context, notifiers)`