diff --git a/log/log.go b/log/log.go index a223351..8b249c8 100644 --- a/log/log.go +++ b/log/log.go @@ -137,6 +137,14 @@ func (l *Logger) SetHeader(h string) { l.template = l.newTemplate(h) } +func (l *Logger) HeaderSkip() int { + return l.skip +} + +func (l *Logger) SetHeaderSkip(skip int) { + l.skip = skip +} + func (l *Logger) Print(i ...interface{}) { l.log(0, fmt.Sprint(i...), false) } @@ -265,6 +273,14 @@ func SetHeader(h string) { global.SetHeader(h) } +func HeaderSkip() int { + return global.HeaderSkip() +} + +func SetHeaderSkip(skip int) { + global.SetHeaderSkip(skip) +} + func Print(i ...interface{}) { global.Print(i...) } diff --git a/log/log_test.go b/log/log_test.go index af1b02c..2b06439 100644 --- a/log/log_test.go +++ b/log/log_test.go @@ -148,6 +148,30 @@ func TestCallerFile(t *testing.T) { assert.Contains(t, b.String(), "log_test.go", "JSON path should report caller file") } +func TestConfigurableHeaderSkip(t *testing.T) { + l := New("test") + l.SetHeader("${short_file}") + b := new(bytes.Buffer) + l.SetOutput(b) + l.SetLevel(DEBUG) + + assert.Equal(t, 2, l.HeaderSkip()) + + // Wrapping function that logs + var wrapperLog = func(msg string) { + l.Info(msg) + } + + // Without adjusting skip, wrapperLog reports log_test.go inside wrapperLog (or test file depending on frames) + // Let's test custom skip + l.SetHeaderSkip(l.HeaderSkip() + 1) + assert.Equal(t, 3, l.HeaderSkip()) + + b.Reset() + wrapperLog("wrapped call") + assert.Contains(t, b.String(), "log_test.go") +} + func BenchmarkLog(b *testing.B) { l := New("test") l.SetOutput(new(bytes.Buffer))