simplify hasCaller check

This commit is contained in:
Dave Clendenan
2016-11-30 15:15:38 -08:00
parent a5c845c224
commit 65f3af38f7
4 changed files with 15 additions and 24 deletions
+3 -13
View File
@@ -72,12 +72,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
b = &bytes.Buffer{}
}
reportCaller := false
if entry.Logger != nil {
reportCaller = entry.Logger.ReportCaller
}
prefixFieldClashes(entry.Data, reportCaller)
prefixFieldClashes(entry.Data, entry.HasCaller())
isColorTerminal := isTerminal && (runtime.GOOS != "windows")
isColored := (f.ForceColors || isColorTerminal) && !f.DisableColors
@@ -93,7 +88,7 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
f.appendKeyValue(b, "time", entry.Time.Format(timestampFormat))
}
f.appendKeyValue(b, "level", entry.Level.String())
if reportCaller {
if entry.HasCaller() {
f.appendKeyValue(b, "method", entry.Caller)
}
if entry.Message != "" {
@@ -125,12 +120,7 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin
caller := ""
reportCaller := false
if entry.Logger != nil {
reportCaller = entry.Logger.ReportCaller
}
if reportCaller {
if entry.HasCaller() {
caller = fmt.Sprintf(" %s()", entry.Caller)
}