Improved handle for unix/windows line endings correctly.

log4go.go

@@ -49,6 +49,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"time"
@@ -196,10 +197,13 @@ func (log Logger) intLogf(lvl Level, format string, args ...interface{}) {
 	}
 
 	// Determine caller func
-	pc, _, lineno, ok := runtime.Caller(2)
+	// pc, _, lineno, ok := runtime.Caller(2)
+	_, file, lineno, ok := runtime.Caller(2)
 	src := ""
 	if ok {
-		src = fmt.Sprintf("%s:%d", runtime.FuncForPC(pc).Name(), lineno)
+		// src = fmt.Sprintf("%s:%d", runtime.FuncForPC(pc).Name(), lineno)
+		// Use the relative path
+		src = fmt.Sprintf("%s:%d", filepath.Base(file), lineno)
 	}
 
 	msg := format
@@ -240,10 +244,13 @@ func (log Logger) intLogc(lvl Level, closure func() string) {
 	}
 
 	// Determine caller func
-	pc, _, lineno, ok := runtime.Caller(2)
+	// pc, _, lineno, ok := runtime.Caller(2)
+	_, file, lineno, ok := runtime.Caller(2)
 	src := ""
 	if ok {
-		src = fmt.Sprintf("%s:%d", runtime.FuncForPC(pc).Name(), lineno)
+		// src = fmt.Sprintf("%s:%d", runtime.FuncForPC(pc).Name(), lineno)
+		// Use the relative path
+		src = fmt.Sprintf("%s:%d", filepath.Base(file), lineno)
 	}
 
 	// Make the log record

pattlog.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"runtime"
 )
 
 const (
@@ -92,7 +93,13 @@ func FormatLogRecord(format string, rec *LogRecord) string {
 			out.Write(piece)
 		}
 	}
-	out.WriteByte('\n')
+
+	// handles line endings
+	lineEnding := "\n"
+	if runtime.GOOS == "windows" {
+	    lineEnding = "\r\n"
+	}
+	out.Write([]byte(lineEnding))
 
 	return out.String()
 }