mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 09:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix conditional in format function

Browse source
This commit is contained in:
Brendan Abolivier 2017-08-23 15:38:13 +01:00
parent d31f6fbcc2
commit b10cf01ae4
No known key found for this signature in database
GPG key ID: 8EF1500759F70623
1 changed files with 26 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/common/log.go
View file

@ -32,7 +32,6 @@ type dendriteFormatter struct {
func (f dendriteFormatter) Format(entry *logrus.Entry) (format []byte, err error) { func (f dendriteFormatter) Format(entry *logrus.Entry) (format []byte, err error) {
entry.Time = entry.Time.UTC() entry.Time = entry.Time.UTC()
if _, ok := entry.Data["prefix"]; ok {
prefix, ok := entry.Data["prefix"].(string) prefix, ok := entry.Data["prefix"].(string)
if !ok { if !ok {
return f.TextFormatter.Format(entry) return f.TextFormatter.Format(entry)
@ -60,9 +59,6 @@ func (f dendriteFormatter) Format(entry *logrus.Entry) (format []byte, err error
} }
entryCpy.Data = fields entryCpy.Data = fields
format, err = f.TextFormatter.Format(&entryCpy) format, err = f.TextFormatter.Format(&entryCpy)
} else {
format, err = f.TextFormatter.Format(entry)
}
return return
} }