Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
张磊
/
FileStorageBeego
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
770dc702
authored
2014-08-27 15:36:07 +0800
by
astaxie
Browse Files
Options
Browse Files
Tag
Download
Plain Diff
Merge pull request #782 from francoishill/patch-19
Extra field if username is empty
2 parents
e146100a
61ce6088
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
logs/smtp.go
logs/smtp.go
View file @
770dc70
...
...
@@ -34,6 +34,7 @@ type SmtpWriter struct {
Password
string
`json:"password"`
Host
string
`json:"Host"`
Subject
string
`json:"subject"`
FromAddress
string
`json:"fromAddress"
RecipientAddresses []string `
json
:
"sendTos"`
Level int `
json
:
"level"`
}
...
...
@@ -50,6 +51,7 @@ func NewSmtpWriter() LoggerInterface {
// "password:"password",
// "host":"smtp.gmail.com:465",
// "subject":"email title",
// "fromAddress":"from@example.com",
// "sendTos":["email1","email2"],
// "level":LevelError
// }
...
...
@@ -141,10 +143,10 @@ func (s *SmtpWriter) WriteMsg(msg string, level int) error {
// Connect to the server, authenticate, set the sender and recipient,
// and send the email all in one step.
content_type := "Content-Type: text/plain" + "; charset=UTF-8"
mailmsg
:=
[]
byte
(
"To: "
+
strings
.
Join
(
s
.
RecipientAddresses
,
";"
)
+
"
\r\n
From: "
+
s
.
Username
+
"<"
+
s
.
Username
+
mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.
FromAddress + "<" + s.FromAddress
+
">\r\nSubject: " + s.Subject + "\r\n" + content_type + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg)
err
:=
s
.
sendMail
(
s
.
Host
,
auth
,
s
.
Username
,
s
.
RecipientAddresses
,
mailmsg
)
err := s.sendMail(s.Host, auth, s.
FromAddress
, s.RecipientAddresses, mailmsg)
return err
}
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment