diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-22 20:27:13 +0800 |
|---|---|---|
| committer | Thomas Boerger <thomas@webhippie.de> | 2016-12-22 13:27:13 +0100 |
| commit | e0ecd9fd93c5e59bd4ad1d10acacb13420ff5301 (patch) | |
| tree | 3a5b3257e1f641d62bb68b06510aaf040e79b251 | |
| parent | 65b1875d2bba97130f2796fe915f2a342ef7869c (diff) | |
| download | gitea-e0ecd9fd93c5e59bd4ad1d10acacb13420ff5301.tar.gz gitea-e0ecd9fd93c5e59bd4ad1d10acacb13420ff5301.zip | |
fix bug #1122 log.smtp receiver configure error (#3602) (#451)
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/app.ini b/conf/app.ini index 84cb05b27e..58a1d69623 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -338,7 +338,7 @@ HOST = ; Mailer user name and password USER = PASSWD = -; Receivers, can be one or more, e.g. ["1@example.com","2@example.com"] +; Receivers, can be one or more, e.g. 1@example.com,2@example.com RECEIVERS = ; For "database" mode only diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 9c00eb7437..c8809f998a 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -686,11 +686,11 @@ func newLogService() { sec.Key("PROTOCOL").In("tcp", []string{"tcp", "unix", "udp"}), sec.Key("ADDR").MustString(":7020")) case "smtp": - LogConfigs[i] = fmt.Sprintf(`{"level":%s,"username":"%s","password":"%s","host":"%s","sendTos":"%s","subject":"%s"}`, level, + LogConfigs[i] = fmt.Sprintf(`{"level":%s,"username":"%s","password":"%s","host":"%s","sendTos":["%s"],"subject":"%s"}`, level, sec.Key("USER").MustString("example@example.com"), sec.Key("PASSWD").MustString("******"), sec.Key("HOST").MustString("127.0.0.1:25"), - sec.Key("RECEIVERS").MustString("[]"), + strings.Replace(sec.Key("RECEIVERS").MustString("example@example.com"), ",", "\",\"", -1), sec.Key("SUBJECT").MustString("Diagnostic message from serve")) case "database": LogConfigs[i] = fmt.Sprintf(`{"level":%s,"driver":"%s","conn":"%s"}`, level, |