perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct amount of stack unwinding for debug prints

Browse Source
This commit is contained in:
Jakob Borg
2015-10-22 11:38:45 +02:00
parent b3a2bf367b
commit 503491392d
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/logger/logger.go
View File

@@ -107,19 +107,25 @@ func (l *logger) callHandlers(level LogLevel, s string) {
// Debugln logs a line with a DEBUG prefix. // Debugln logs a line with a DEBUG prefix.
func (l *logger) Debugln(vals ...interface{}) { func (l *logger) Debugln(vals ...interface{}) {
l.debugln(3, vals)
}
func (l *logger) debugln(level int, vals ...interface{}) {
l.mut.Lock() l.mut.Lock()
defer l.mut.Unlock() defer l.mut.Unlock()
s := fmt.Sprintln(vals...) s := fmt.Sprintln(vals...)
l.logger.Output(2, "DEBUG: "+s) l.logger.Output(level, "DEBUG: "+s)
l.callHandlers(LevelDebug, s) l.callHandlers(LevelDebug, s)
} }
// Debugf logs a formatted line with a DEBUG prefix. // Debugf logs a formatted line with a DEBUG prefix.
func (l *logger) Debugf(format string, vals ...interface{}) { func (l *logger) Debugf(format string, vals ...interface{}) {
l.debugf(3, format, vals...)
}
func (l *logger) debugf(level int, format string, vals ...interface{}) {
l.mut.Lock() l.mut.Lock()
defer l.mut.Unlock() defer l.mut.Unlock()
s := fmt.Sprintf(format, vals...) s := fmt.Sprintf(format, vals...)
l.logger.Output(2, "DEBUG: "+s) l.logger.Output(level, "DEBUG: "+s)
l.callHandlers(LevelDebug, s) l.callHandlers(LevelDebug, s)
} }
@@ -293,7 +299,7 @@ func (l *facilityLogger) Debugln(vals ...interface{}) {
if !l.ShouldDebug(l.facility) { if !l.ShouldDebug(l.facility) {
return return
} }
l.logger.Debugln(vals...) l.logger.debugln(3, vals...)
} }
// Debugf logs a formatted line with a DEBUG prefix. // Debugf logs a formatted line with a DEBUG prefix.
@@ -301,7 +307,7 @@ func (l *facilityLogger) Debugf(format string, vals ...interface{}) {
if !l.ShouldDebug(l.facility) { if !l.ShouldDebug(l.facility) {
return return
} }
l.logger.Debugf(format, vals...) l.logger.debugf(3, format, vals...)
} }
// A Recorder keeps a size limited record of log events. // A Recorder keeps a size limited record of log events.