lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-06-12 14:10:39 +00:00
Code Issues Releases Activity

Merge branch 'develop' into add-gosimple

Browse Source
This commit is contained in:
astaxie
2017-03-18 11:20:30 +08:00
committed by GitHub
parent 37c1ffc57a 8dbf9eb0bf
commit d956444965
9 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logs/alils/log.pb.go
View File

@ -395,7 +395,7 @@ func sovLog(x uint64) (n int) {
return n
}
func sozLog(x uint64) (n int) {
return sovLog(uint64((x << 1) ^ uint64((int64(x) >> 63))))
return sovLog((x << 1) ^ (x >> 63))
}
func (m *Log) Unmarshal(data []byte) error {
var hasFields [1]uint64

2
logs/smtp.go
View File

@ -102,7 +102,7 @@ func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd
if err != nil {
return err
}
_, err = w.Write([]byte(msgContent))
_, err = w.Write(msgContent)
if err != nil {
return err
}