fix(shoutrrr): make shoutrrr init failure a fatal error (#561)

also writes out any (unlikely) errors from template.Execute instead of ignoring
pull/563/head
nils måsén 5 years ago committed by GitHub
parent 52300804d2
commit 1081f3c24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -47,10 +47,8 @@ func NewNotifier(c *cobra.Command) *Notifier {
default: default:
log.Fatalf("Unknown notification type %q", t) log.Fatalf("Unknown notification type %q", t)
} }
if tn != nil {
n.types = append(n.types, tn) n.types = append(n.types, tn)
} }
}
return n return n
} }

@ -32,8 +32,7 @@ func newShoutrrrNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Noti
urls, _ := flags.GetStringArray("notification-url") urls, _ := flags.GetStringArray("notification-url")
r, err := shoutrrr.CreateSender(urls...) r, err := shoutrrr.CreateSender(urls...)
if err != nil { if err != nil {
fmt.Printf("Failed to initialize Shoutrrr notifications: %s\n", err.Error()) log.Fatalf("Failed to initialize Shoutrrr notifications: %s\n", err.Error())
return nil
} }
n := &shoutrrrTypeNotifier{ n := &shoutrrrTypeNotifier{
@ -50,7 +49,9 @@ func newShoutrrrNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Noti
func (e *shoutrrrTypeNotifier) buildMessage(entries []*log.Entry) string { func (e *shoutrrrTypeNotifier) buildMessage(entries []*log.Entry) string {
var body bytes.Buffer var body bytes.Buffer
e.template.Execute(&body, entries) if err := e.template.Execute(&body, entries); err != nil {
fmt.Printf("Failed to execute Shoutrrrr template: %s\n", err.Error())
}
return body.String() return body.String()
} }

Loading…
Cancel
Save