Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-12-13 21:56:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
also writes out any (unlikely) errors from template.Execute instead of ignoring
This commit is contained in:
nils måsén 2020-05-30 19:36:20 +02:00 • committed by GitHub
parent 52300804d2
commit 1081f3c24c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/notifications/notifier.go
View file

@ -47,9 +47,7 @@ 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

7
pkg/notifications/shoutrrr.go
View file

@ -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()
} }