Fix caller depth when using .Log method (#72)

Author: instabledesign

logger.go

@@ -51,46 +51,50 @@ func (l *Logger) onError(error error, entry Entry) {
 
 // Debug will log a debug message
 func (l *Logger) Debug(message string, fields ...Field) {
-	l.Log(message, DebugLevel, fields...)
+	l.log(message, DebugLevel, fields...)
 }
 
 // Info will log a info message
 func (l *Logger) Info(message string, fields ...Field) {
-	l.Log(message, InfoLevel, fields...)
+	l.log(message, InfoLevel, fields...)
 }
 
 // Notice will log a notice message
 func (l *Logger) Notice(message string, fields ...Field) {
-	l.Log(message, NoticeLevel, fields...)
+	l.log(message, NoticeLevel, fields...)
 }
 
 // Warning will log a warning message
 func (l *Logger) Warning(message string, fields ...Field) {
-	l.Log(message, WarningLevel, fields...)
+	l.log(message, WarningLevel, fields...)
 }
 
 // Error will log a message
 func (l *Logger) Error(message string, fields ...Field) {
-	l.Log(message, ErrorLevel, fields...)
+	l.log(message, ErrorLevel, fields...)
 }
 
 // Critical will log a critical message
 func (l *Logger) Critical(message string, fields ...Field) {
-	l.Log(message, CriticalLevel, fields...)
+	l.log(message, CriticalLevel, fields...)
 }
 
 // Alert will log a alert message
 func (l *Logger) Alert(message string, fields ...Field) {
-	l.Log(message, AlertLevel, fields...)
+	l.log(message, AlertLevel, fields...)
 }
 
 // Emergency will log a emergency message
 func (l *Logger) Emergency(message string, fields ...Field) {
-	l.Log(message, EmergencyLevel, fields...)
+	l.log(message, EmergencyLevel, fields...)
 }
 
 // Log will log a message with a given level
 func (l *Logger) Log(message string, level Level, fields ...Field) {
+	l.log(message, level, fields...)
+}
+
+func (l *Logger) log(message string, level Level, fields ...Field) {
 	entry := Entry{message, level, NewContext(fields...)}
 	if err := l.handler(entry); err != nil {
 		l.onError(err, entry)

middleware/caller_test.go

@@ -3,6 +3,7 @@ package middleware_test
 import (
 	"testing"
 
+	"github.com/gol4ng/logger/handler"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/gol4ng/logger"
@@ -16,7 +17,7 @@ func TestCaller_Handle(t *testing.T) {
 		contextStr := entry.Context.String()
 		assert.Contains(t, contextStr, "<file:")
 		assert.Contains(t, contextStr, "caller_test.go")
-		assert.Contains(t, contextStr, "<line:31>")
+		assert.Contains(t, contextStr, "<line:32>")
 
 		return nil
 	}
@@ -30,3 +31,23 @@ func TestCaller_Handle(t *testing.T) {
 	}
 	assert.Nil(t, caller(mockHandler)(logEntry))
 }
+
+func TestCaller_Handle_SameCallerDepth(t *testing.T) {
+	caller := middleware.Caller(3)
+	m := handler.NewMemory()
+	l := logger.NewLogger(caller(m.Handle))
+
+	l.Debug("my_fake_debug_message")
+	l.Log("my_fake_debug_message", logger.DebugLevel)
+
+	entries := m.GetEntries()
+	assert.Len(t, entries, 2)
+
+	entry1 := entries[0]
+	assert.Contains(t, (*entry1.Context)["file"].Value, "caller_test.go")
+
+	entry2 := entries[1]
+	assert.Contains(t, (*entry2.Context)["file"].Value, "caller_test.go")
+
+	assert.Equal(t, (*entry1.Context)["file"].Value, (*entry2.Context)["file"].Value, "This 2 logs must have the same context file value")
+}