Andreas/watchtower
1
0
Fork 0
mirror of https://github.com/containrrr/watchtower.git synced 2025-09-22 05:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some var ref errors

Browse source
This commit is contained in:
Simon Aronsson 2019-11-17 11:19:57 +01:00
parent 6910ad8c4e
commit ea596ea747
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -59,7 +59,6 @@ require (
golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692 golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 golang.org/x/net v0.0.0-20190522155817-f3200d17e092
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/genproto v0.0.0-20190401181712-f467c93bbac2 google.golang.org/genproto v0.0.0-20190401181712-f467c93bbac2
google.golang.org/grpc v1.21.0 google.golang.org/grpc v1.21.0
gotest.tools v2.2.0+incompatible // indirect gotest.tools v2.2.0+incompatible // indirect

2
internal/flags/flags.go
View file

@ -179,7 +179,7 @@ Should only be used for testing.
"", "",
viper.GetString("WATCHTOWER_NOTIFICATION_EMAIL_SUBJECTTAG"), viper.GetString("WATCHTOWER_NOTIFICATION_EMAIL_SUBJECTTAG"),
"Subject prefix tag for notifications via mail") "Subject prefix tag for notifications via mail")
flags.StringP( flags.StringP(
"notification-slack-hook-url", "notification-slack-hook-url",
"", "",

22
pkg/notifications/email.go
View file

@ -23,13 +23,13 @@ const (
// - It would only send errors // - It would only send errors
// We work around that by holding on to log entries until the update cycle is done. // We work around that by holding on to log entries until the update cycle is done.
type emailTypeNotifier struct { type emailTypeNotifier struct {
From, To string From, To string
Server, User, Password, SubjectTag string Server, User, Password, SubjectTag string
Port int Port int
tlsSkipVerify bool tlsSkipVerify bool
entries []*log.Entry entries []*log.Entry
logLevels []log.Level logLevels []log.Level
delay time.Duration delay time.Duration
} }
func newEmailNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier { func newEmailNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifier {
@ -64,10 +64,12 @@ func newEmailNotifier(c *cobra.Command, acceptedLogLevels []log.Level) t.Notifie
} }
func (e *emailTypeNotifier) buildMessage(entries []*log.Entry) []byte { func (e *emailTypeNotifier) buildMessage(entries []*log.Entry) []byte {
if SubjectTag == "" { var emailSubject string
emailSubject := "Watchtower updates"
if e.SubjectTag == "" {
emailSubject = "Watchtower updates"
} else { } else {
emailSubject := SubjectTag + " Watchtower updates" emailSubject = e.SubjectTag + " Watchtower updates"
} }
if hostname, err := os.Hostname(); err == nil { if hostname, err := os.Hostname(); err == nil {
emailSubject += " on " + hostname emailSubject += " on " + hostname
@ -134,7 +136,7 @@ func (e *emailTypeNotifier) SendNotification() {
time.Sleep(e.delay) time.Sleep(e.delay)
} }
e.sendEntries(e.entries) e.sendEntries(e.entries)
e.entries = nil e.entries = nil
} }