From 4999fff29b6ec3ef1bc5d2db9fd615392cef3fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 22 Oct 2016 10:24:31 +0200 Subject: [PATCH] fix(alerting): fixed email notification so it splits email address multiple ways, fixes #6353 --- pkg/services/alerting/notifiers/email.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkg/services/alerting/notifiers/email.go b/pkg/services/alerting/notifiers/email.go index c7f7bf00e3b..9b510cd3275 100644 --- a/pkg/services/alerting/notifiers/email.go +++ b/pkg/services/alerting/notifiers/email.go @@ -29,9 +29,18 @@ func NewEmailNotifier(model *m.AlertNotification) (alerting.Notifier, error) { return nil, alerting.ValidationError{Reason: "Could not find addresses in settings"} } + // split addresses with a few different ways + addresses := strings.FieldsFunc(addressesString, func(r rune) bool { + switch r { + case ',', ';', '\n': + return true + } + return false + }) + return &EmailNotifier{ NotifierBase: NewNotifierBase(model.Id, model.IsDefault, model.Name, model.Type, model.Settings), - Addresses: strings.Split(addressesString, `;`), + Addresses: addresses, log: log.New("alerting.notifier.email"), }, nil }