git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

fix bug #1122 log.smtp receiver configure error (#3602) (#451)

Browse source
This commit is contained in:
Lunny Xiao 2016-12-22 20:27:13 +08:00 • committed by Thomas Boerger
commit e0ecd9fd93
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
conf/app.ini
View file

@ -338,7 +338,7 @@ HOST =
; Mailer user name and password ; Mailer user name and password
USER = USER =
PASSWD = 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 = RECEIVERS =
; For "database" mode only ; For "database" mode only

4
modules/setting/setting.go
View file

@ -686,11 +686,11 @@ func newLogService() {
sec.Key("PROTOCOL").In("tcp", []string{"tcp", "unix", "udp"}), sec.Key("PROTOCOL").In("tcp", []string{"tcp", "unix", "udp"}),
sec.Key("ADDR").MustString(":7020")) sec.Key("ADDR").MustString(":7020"))
case "smtp": 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("USER").MustString("example@example.com"),
sec.Key("PASSWD").MustString("******"), sec.Key("PASSWD").MustString("******"),
sec.Key("HOST").MustString("127.0.0.1:25"), 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")) sec.Key("SUBJECT").MustString("Diagnostic message from serve"))
case "database": case "database":
LogConfigs[i] = fmt.Sprintf(`{"level":%s,"driver":"%s","conn":"%s"}`, level, LogConfigs[i] = fmt.Sprintf(`{"level":%s,"driver":"%s","conn":"%s"}`, level,