Skip to content

Commit 14b5fb1

Browse files
committed
#### Version 0.9.4
* EMailTarget增加MailNickName设置,用于设置发件人友好名称 * 2018-01-19 15:30
1 parent 251d6bf commit 14b5fb1

8 files changed

Lines changed: 26 additions & 7 deletions

File tree

config/config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ type (
102102
Encode string `xml:"encode,attr"`
103103
MailServer string `xml:"mailserver,attr"`
104104
MailAccount string `xml:"mailaccount,attr"`
105+
MailNickName string `xml:"mailnickname,attr"`
105106
MailPassword string `xml:"mailpassword,attr"`
106107
ToMail string `xml:"tomail,attr"`
107108
Subject string `xml:"subject,attr"`

const/const.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package _const
22

33
const(
4-
Version = "0.9.3"
4+
Version = "0.9.4"
55
)
66

77
const (

example/normal/log.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
<variable>
88
<var name="LogDir" value="./"/>
99
<var name="LogDateDir" value="./{year}/{month}/{day}/"/>
10-
<var name="MailServer" value="smtp.xxxx.cn"/>
11-
<var name="ToMail" value="xxxx"/>
12-
<var name="MailAccount" value="xxx@xxx.cn"/>
13-
<var name="MailPassword" value="xxxx"/>
10+
<var name="MailServer" value="XXX.XXX.cn:25"/>
11+
<var name="ToMail" value="XXX@XXX.cn"/>
12+
<var name="MailNickName" value="XXXXXX"/>
13+
<var name="MailAccount" value="XXX@XXX.cn"/>
14+
<var name="MailPassword" value="XXX"/>
1415
<var name="SysName" value="Devfeel.DotLog"/>
1516
</variable>
1617

example/normal/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
func main() {
99
dotlog.StartLogService("./log.conf")
10-
log1 := dotlog.GetLogger("FileLogger")
10+
log1 := dotlog.GetLogger("ClassicsLogger")
1111
log1.Trace("example-normal trace main")
1212
log1.Debug("example-normal debug main")
1313
log1.Info("example-normal info main")

targets/target_email.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type EMailTarget struct {
1313
BaseTarget
1414

1515
MailServer string
16+
MailNickName string
1617
MailAccount string
1718
MailPassword string
1819
ToMail string
@@ -28,10 +29,16 @@ func NewEMailTarget(conf *config.EMailTargetConfig) *EMailTarget {
2829
t.Encode = conf.Encode
2930
t.Layout = conf.Layout
3031
t.MailServer = layout.CompileLayout(conf.MailServer)
32+
t.MailNickName = layout.CompileLayout(conf.MailNickName)
3133
t.MailAccount = layout.CompileLayout(conf.MailAccount)
3234
t.MailPassword = layout.CompileLayout(conf.MailPassword)
3335
t.ToMail = layout.CompileLayout(conf.ToMail)
3436
t.Subject = layout.CompileLayout(conf.Subject)
37+
38+
if t.MailNickName == ""{
39+
t.MailNickName = t.MailAccount
40+
}
41+
3542
//启动异步写文件
3643
go t.handleLog()
3744
return t
@@ -62,6 +69,7 @@ func (t *EMailTarget) WriteLog(log string, useLayout string, level string) {
6269
func (t *EMailTarget) writeTarget(log string) {
6370
mail := new(_email.MailConfig)
6471
mail.Host = t.MailServer
72+
mail.FromNickName = t.MailNickName
6573
mail.FromAccount = t.MailAccount
6674
mail.FromPassword = t.MailPassword
6775
mail.ToMail = t.ToMail

targets/targetutil.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func GetDefaultEMailTarget(name, level string) Target {
4343
Encode: _const.DefaultEncode,
4444
Layout: "{DateTime} {LogLevel} {message}",
4545
MailServer: "{MailServer}",
46+
MailNickName: "{MailNickName}",
4647
MailAccount: "{MailAccount}",
4748
MailPassword: "{MailPassword}",
4849
ToMail: "{ToMail}",

util/email/email.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
type MailConfig struct {
1010
Host string
1111
FromAccount string
12+
FromNickName string
1213
FromPassword string
1314
ToMail string //if have multi account,use ";" connect
1415
Subject string
@@ -31,7 +32,11 @@ func SendEMail(config *MailConfig) error {
3132
content_type = "Content-Type: text/plain" + "; charset=UTF-8"
3233
}
3334

34-
msg := []byte("To: " + config.ToMail + "\r\nFrom: " + config.FromAccount + ">\r\nSubject: " + config.Subject + "\r\n" + content_type + "\r\n\r\n" + config.Body)
35+
if config.FromNickName == ""{
36+
config.FromNickName = config.FromAccount
37+
}
38+
39+
msg := []byte("To: " + config.ToMail + "\r\nFrom: " + config.FromNickName + "<"+config.FromAccount+">\r\nSubject: " + config.Subject + "\r\n" + content_type + "\r\n\r\n" + config.Body)
3540
send_to := strings.Split(config.ToMail, ";")
3641
err := sendMailWithNoTSL(config.Host, auth, config.FromAccount, send_to, msg)
3742
return err

version.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
## dotlog版本记录:
22

3+
#### Version 0.9.4
4+
* EMailTarget增加MailNickName设置,用于设置发件人友好名称
5+
* 2018-01-19 15:30
36

47
#### Version 0.9.3
58
* 新增FmtTarget,用于向控制台输出日志,同时如果为Error级别消息,同步向StdErr输出

0 commit comments

Comments
 (0)