RedirectStdLog

Author: ccpaging

level_encoder.go

@@ -102,8 +102,8 @@ func NewEndColorizer(typ string) patt.Encoder {
 }
 
 func (e *colorLevel) NewEncoder(typ string) patt.Encoder {
-	// Clear cache and remember mode
-	ne := &colorLevel{isBegin: e.isBegin}
+	// Build a new encoder, clear cache and remember mode
+	e = &colorLevel{isBegin: e.isBegin}
 
 	isColor := false
 	switch typ {
@@ -117,19 +117,23 @@ func (e *colorLevel) NewEncoder(typ string) patt.Encoder {
 	}
 
 	if !isColor {
-		ne.encode = e.Nop
+		e.encode = e.Nop
 		return e
 	}
 
-	if ne.isBegin {
-		ne.encode = e.Begin
+	if e.isBegin {
+		e.encode = e.Begin
 	} else {
-		ne.encode = e.End
+		e.encode = e.End
 	}
-	return ne
+	return e
 }
 
 func (e *colorLevel) Encode(out *bytes.Buffer, r *driver.Recorder) {
+	if e.encode == nil {
+		println("encode is nil")
+		return
+	}
 	e.encode(out, r.Level)
 }
 

patt/encoder.go

@@ -94,19 +94,19 @@ func NewZoneEncoder(typ string) Encoder {
 }
 
 func (e *cacheTime) NewEncoder(typ string) Encoder {
-	// Clear cache and remember mode
-	ne := &cacheTime{mode: e.mode}
-	switch ne.mode {
+	// Build a new encoder, clear cache and remember mode
+	e = &cacheTime{mode: e.mode}
+	switch e.mode {
 	case modeDate:
-		ne.setDate(typ)
+		e.setDate(typ)
 	case modeZone:
-		ne.setZone(typ)
+		e.setZone(typ)
 	case modeTime:
 		fallthrough
 	default:
-		ne.setTime(typ)
+		e.setTime(typ)
 	}
-	return ne
+	return e
 }
 
 func (e *cacheTime) Encode(out *bytes.Buffer, r *driver.Recorder) {

stdlog.go

@@ -5,30 +5,40 @@ package nxlog4go
 
 import (
 	"bytes"
-	"log"
+	stdlog "log"
 )
 
 // NewStdLog returns a *log.Logger which writes to the supplied logger Entry at
 // Info Level.
-func NewStdLog(e *Entry) *log.Logger {
+//
+// Example: log := NewStdLogAt(e.AddCallerSkip(3), level)
+func NewStdLog(e *Entry) *stdlog.Logger {
 	logFunc := e.Info
-	return log.New(&logWriter{logFunc}, "" /* prefix */, 0 /* flags */)
+	return stdlog.New(&logWriter{logFunc}, /* out io.Writer */
+		"", /* prefix */
+		0 /* flags */)
 }
 
 // NewStdLogAt returns *log.Logger which writes to supplied logger Entry at
 // required level.
-func NewStdLogAt(e *Entry, level interface{}) *log.Logger {
-	logFunc := levelToFunc(e, level)
-	return log.New(&logWriter{logFunc}, "" /* prefix */, 0 /* flags */)
+//
+// Example: log := NewStdLogAt(e.AddCallerSkip(3), "debug")
+func NewStdLogAt(e *Entry, level interface{}) *stdlog.Logger {
+	logWriteFunc := levelToWriteFunc(e, level)
+	return stdlog.New(&logWriter{logWriteFunc}, /* out io.Writer */
+		"", /* prefix */
+		0 /* flags */)
 }
 
 // RedirectStdLog redirects output from the standard library's package-global
-// logger to the supplied logger at InfoLevel. Since zap already handles caller
+// logger to the supplied logger at Info level. Since Entry already handles caller
 // annotations, timestamps, etc., it automatically disables the standard
 // library's annotations and prefixing.
 //
 // It returns a function to restore the original prefix and flags and reset the
-// standard library's output to os.Stderr.
+// output io.Writer to os.Stderr.
+//
+// Example: restoreFunc := RedirectStdLog(elog.AddCallerSkip(3))
 func RedirectStdLog(e *Entry) func() {
 	return redirectStdLogAt(e, INFO)
 }
@@ -40,26 +50,29 @@ func RedirectStdLog(e *Entry) func() {
 //
 // It returns a function to restore the original prefix and flags and reset the
 // standard library's output to os.Stderr.
+//
+// Example: restoreFunc := RedirectStdLogAt(elog.AddCallerSkip(3), "debug")
 func RedirectStdLogAt(e *Entry, level interface{}) func() {
 	return redirectStdLogAt(e, level)
 }
 
 func redirectStdLogAt(e *Entry, level interface{}) func() {
-	flags := log.Flags()
-	prefix := log.Prefix()
-	writer := log.Writer()
-	log.SetFlags(0)
-	log.SetPrefix("")
-	logFunc := levelToFunc(e.AddCallerSkip(3), level)
-	log.SetOutput(&logWriter{logFunc})
+	flags := stdlog.Flags()
+	prefix := stdlog.Prefix()
+	writer := stdlog.Writer()
+	stdlog.SetFlags(0)
+	stdlog.SetPrefix("")
+	writeFunc := levelToWriteFunc(e, level)
+	stdlog.SetOutput(&logWriter{writeFunc})
+
+	// Return the restore original function
 	return func() {
-		log.SetFlags(flags)
-		log.SetPrefix(prefix)
-		log.SetOutput(writer)
+		stdlog.SetFlags(flags)
+		stdlog.SetPrefix(prefix)
+		stdlog.SetOutput(writer)
 	}
 }
-
-func levelToFunc(e *Entry, level interface{}) func(interface{}, ...interface{}) {
+func levelToWriteFunc(e *Entry, level interface{}) func(interface{}, ...interface{}) {
 	n := Level(INFO).Int(level)
 	switch n {
 	case FINEST:

stdlog_test.go

@@ -66,7 +66,7 @@ func TestRedirectStdLog(t *testing.T) {
 		"format", "[%L] [%P] (%S) %M%F")
 	elog := logger.With("source", "testing")
 
-	restore := RedirectStdLogAt(elog, "debug")
+	restoreFunc := RedirectStdLogAt(elog.AddCallerSkip(3), "debug")
 	log.Println("redirected.")
 	want := "[DEBG] [redirected] (stdlog_test.go) redirected. source=testing\n"
 	if got := buf.String(); got != want {
@@ -75,6 +75,6 @@ func TestRedirectStdLog(t *testing.T) {
 	}
 	buf.Reset()
 
-	restore()
+	restoreFunc()
 	testStdlog()
 }