From 4d83fb95622d42e47c97d94f3f4b86fe93ed9bcc Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 25 Nov 2019 11:36:34 +0000 Subject: [PATCH 1/2] Fix #9151 - sendTos should be an array --- modules/setting/log.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/setting/log.go b/modules/setting/log.go index cb8f1420840d..0f3232f45cc1 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -131,7 +131,7 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions logConfig["username"] = sec.Key("USER").MustString("example@example.com") logConfig["password"] = sec.Key("PASSWD").MustString("******") logConfig["host"] = sec.Key("HOST").MustString("127.0.0.1:25") - logConfig["sendTos"] = sec.Key("RECEIVERS").MustString("[]") + logConfig["sendTos"] = strings.Split(sec.Key("RECEIVERS").MustString(""), ",") logConfig["subject"] = sec.Key("SUBJECT").MustString("Diagnostic message from Gitea") } From 67427b09c1a8236944e37641518d2eadce4a9782 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Mon, 25 Nov 2019 12:40:14 +0000 Subject: [PATCH 2/2] trimspace from the addresses --- modules/setting/log.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/setting/log.go b/modules/setting/log.go index 0f3232f45cc1..5a54a8688eee 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -131,7 +131,11 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions logConfig["username"] = sec.Key("USER").MustString("example@example.com") logConfig["password"] = sec.Key("PASSWD").MustString("******") logConfig["host"] = sec.Key("HOST").MustString("127.0.0.1:25") - logConfig["sendTos"] = strings.Split(sec.Key("RECEIVERS").MustString(""), ",") + sendTos := strings.Split(sec.Key("RECEIVERS").MustString(""), ",") + for i, address := range sendTos { + sendTos[i] = strings.TrimSpace(address) + } + logConfig["sendTos"] = sendTos logConfig["subject"] = sec.Key("SUBJECT").MustString("Diagnostic message from Gitea") }