Add RedirectSTDLogOutput(...) to console logger to allow capturing of all std log messages.

Author: joeybloggs

README.md

@@ -1,6 +1,6 @@
 ## log
 <img align="right" src="https://raw.githubusercontent.com/go-playground/log/master/logo.png">
-![Project status](https://img.shields.io/badge/version-2.0-green.svg)
+![Project status](https://img.shields.io/badge/version-2.1-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/log/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/log)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/log/badge.svg?branch=master)](https://coveralls.io/github/go-playground/log?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/log)](https://goreportcard.com/report/github.com/go-playground/log)

handlers/console/console.go

@@ -1,6 +1,7 @@
 package console
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	stdlog "log"
@@ -39,6 +40,7 @@ type Console struct {
 	gopath          string
 	fileDisplay     log.FilenameDisplay
 	displayColor    bool
+	redirStdOutput  bool
 }
 
 // Colors mapping.
@@ -76,6 +78,12 @@ func (c *Console) SetFilenameDisplay(fd log.FilenameDisplay) {
 	c.fileDisplay = fd
 }
 
+// RedirectSTDLogOutput tells Console to redirect the std Logger output
+// to the log package itself.
+func (c *Console) RedirectSTDLogOutput(b bool) {
+	c.redirStdOutput = b
+}
+
 // DisplayColor tells Console to output in color or not
 // Default is : true
 func (c *Console) DisplayColor(color bool) {
@@ -136,9 +144,38 @@ func (c *Console) Run() chan<- *log.Entry {
 		go c.handleLog(ch)
 	}
 
+	// let's check to see if we should hanlde the std log messages as well
+	if c.redirStdOutput {
+
+		done := make(chan struct{})
+
+		go handleStdLogger(done)
+
+		<-done // have to wait, it was running too quickly and some messages can be lost
+	}
+
 	return ch
 }
 
+// this will redirect the output of
+func handleStdLogger(done chan<- struct{}) {
+	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
+
+	stdlog.SetOutput(w)
+
+	scanner := bufio.NewScanner(r)
+
+	go func() {
+		done <- struct{}{}
+	}()
+
+	for scanner.Scan() {
+		log.WithFields(log.F("stdlog", true)).Info(scanner.Text())
+	}
+}
+
 // handleLog consumes and logs any Entry's passed to the channel
 func (c *Console) handleLog(entries <-chan *log.Entry) {
 

handlers/console/console_test.go

@@ -2,6 +2,7 @@ package console
 
 import (
 	"bytes"
+	stdlog "log"
 	"strings"
 	"testing"
 
@@ -19,7 +20,6 @@ import (
 // go test -coverprofile cover.out && go tool cover -html=cover.out -o cover.html
 
 func TestConsoleLogger(t *testing.T) {
-
 	tests := getConsoleLoggerTests()
 
 	buff := new(bytes.Buffer)
@@ -274,6 +274,29 @@ func TestSetFilenameColor(t *testing.T) {
 	buff.Reset()
 }
 
+func TestConsoleSTDLogCapturing(t *testing.T) {
+
+	buff := new(bytes.Buffer)
+
+	cLog := New()
+	cLog.SetWriter(buff)
+	cLog.DisplayColor(false)
+	cLog.SetBuffersAndWorkers(3, 3)
+	cLog.SetTimestampFormat("MST")
+	cLog.RedirectSTDLogOutput(true)
+	log.RegisterHandler(cLog, log.AllLevels...)
+
+	stdlog.Println("STD LOG message")
+
+	s := buff.String()
+
+	expected := "STD LOG message stdlog=true"
+
+	if !strings.Contains(s, expected) {
+		t.Errorf("Expected '%s' Got '%s'", expected, s)
+	}
+}
+
 type test struct {
 	lvl    log.Level
 	msg    string