re
/
logrus
forked from mirror/logrus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code and comments clean up

This commit is contained in:
David Bariod 2021-02-16 18:13:03 +01:00
parent 15ca3c0694
commit 5cb4bf65c6
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
entry.go
View File

@ -88,10 +88,6 @@ func (entry *Entry) Dup() *Entry {
// Returns the bytes representation of this entry from the formatter. // Returns the bytes representation of this entry from the formatter.
func (entry *Entry) Bytes() ([]byte, error) { func (entry *Entry) Bytes() ([]byte, error) {
return entry.bytes_nolock()
}
func (entry *Entry) bytes_nolock() ([]byte, error) {
return entry.Logger.Formatter.Format(entry) return entry.Logger.Formatter.Format(entry)
} }
@ -222,8 +218,6 @@ func (entry Entry) HasCaller() (has bool) {
entry.Caller != nil entry.Caller != nil
} }
// This function is not declared with a pointer value because otherwise
// race conditions will occur when using multiple goroutines
func (entry *Entry) log(level Level, msg string) { func (entry *Entry) log(level Level, msg string) {
var buffer *bytes.Buffer var buffer *bytes.Buffer
@ -279,13 +273,11 @@ func (entry *Entry) write() {
fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err) fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
return return
} }
func() { entry.Logger.mu.Lock()
entry.Logger.mu.Lock() defer entry.Logger.mu.Unlock()
defer entry.Logger.mu.Unlock() if _, err := entry.Logger.Out.Write(serialized); err != nil {
if _, err := entry.Logger.Out.Write(serialized); err != nil { fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err) }
}
}()
} }
func (entry *Entry) Log(level Level, args ...interface{}) { func (entry *Entry) Log(level Level, args ...interface{}) {