switch back to log4go 4.0.2

Author: ccpaging

log4go_test.go

@@ -100,7 +100,7 @@ func TestConsoleLogWriter(t *testing.T) {
 	console.format = "[%T %z %D] [%L] [%S] %M"
 
 	r, w := io.Pipe()
-	console.iow = w
+	console.out = w
 
 	defer console.Close()
 
@@ -529,13 +529,14 @@ func BenchmarkFileUtilNotLog(b *testing.B) {
 	os.Remove("benchlog.log")
 }
 
-// Benchmark results (darwin amd64 6g)
-//elog.BenchmarkConsoleLog           100000       22819 ns/op
-//elog.BenchmarkConsoleNotLogged    2000000         879 ns/op
-//elog.BenchmarkConsoleUtilLog        50000       34380 ns/op
-//elog.BenchmarkConsoleUtilNotLog   1000000        1339 ns/op
-//elog.BenchmarkFileLog              100000       26497 ns/op
-//elog.BenchmarkFileNotLogged       2000000         821 ns/op
-//elog.BenchmarkFileUtilLog           50000       33945 ns/op
-//elog.BenchmarkFileUtilNotLog      1000000        1258 ns/op
+// Benchmark results (windows amd64 10g)
+// BenchmarkFormatLogRecord-4        300000              4433 ns/op
+// BenchmarkConsoleLog-4            1000000              1746 ns/op
+// BenchmarkConsoleNotLogged-4     20000000                97.3 ns/op
+// BenchmarkConsoleUtilLog-4         300000              3783 ns/op
+// BenchmarkConsoleUtilNotLog-4    20000000               102 ns/op
+// BenchmarkFileLog-4                200000              9910 ns/op
+// BenchmarkFileNotLogged-4        20000000                94.9 ns/op
+// BenchmarkFileUtilLog-4            200000              9610 ns/op
+// BenchmarkFileUtilNotLog-4       20000000               103 ns/op
 

termlog.go

@@ -6,22 +6,37 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"github.com/daviddengcn/go-colortext"
 )
 
 var stdout io.Writer = os.Stdout
 
+var isColorful = (os.Getenv("TERM") != "" && os.Getenv("TERM") != "dumb") ||
+	 os.Getenv("ConEmuANSI") == "ON"
+
+// 0, Black; 1, Red; 2, Green; 3, Yellow; 4, Blue; 5, Purple; 6, Cyan; 7, White
+var ColorBytes = [...][]byte{
+	[]byte("\x1b[0;34m"),	   // FINEST, Blue
+	[]byte("\x1b[0;36m"),	   // FINE, Cyan
+	[]byte("\x1b[0;32m"),	   // DEBUG, Green
+	[]byte("\x1b[0;35m"), 	   // TRACE, Purple
+ 	nil,					   // INFO, Default
+ 	[]byte("\x1b[1;33m"), 	   // WARNING, Yellow
+ 	[]byte("\x1b[0;31m"), 	   // ERROR, Red
+ 	[]byte("\x1b[0;31m;47m"),  // CRITICAL, Red - White
+}
+var ColorReset = []byte("\x1b[0m")
+
 // This is the standard writer that prints to standard output.
 type ConsoleLogWriter struct {
-	iow		io.Writer
+	out		io.Writer
 	color 	bool	
 	format 	string
 }
 
 // This creates a new ConsoleLogWriter
 func NewConsoleLogWriter() *ConsoleLogWriter {
 	c := &ConsoleLogWriter{
-		iow:	stdout,
+		out:	stdout,
 		color:	false,
 		format: "[%T %D %Z] [%L] (%S) %M",
 	}
@@ -46,22 +61,8 @@ func (c *ConsoleLogWriter) Close() {
 
 func (c *ConsoleLogWriter) LogWrite(rec *LogRecord) {
 	if c.color {
-		switch rec.Level {
-			case CRITICAL:
-				ct.ChangeColor(ct.Red, true, ct.White, false)
-			case ERROR:
-				ct.ChangeColor(ct.Red, false, 0, false)
-			case WARNING:
-				ct.ChangeColor(ct.Yellow, false, 0, false)
-			case INFO:
-				ct.ChangeColor(ct.Green, false, 0, false)
-			case DEBUG:
-				ct.ChangeColor(ct.Magenta, false, 0, false)
-			case TRACE:
-				ct.ChangeColor(ct.Cyan, false, 0, false)
-			default:
-		}
-		defer ct.ResetColor()
+		c.out.Write(ColorBytes[rec.Level])
+		defer c.out.Write(ColorReset)
 	}
-	fmt.Fprint(c.iow, FormatLogRecord(c.format, rec))
+	fmt.Fprint(c.out, FormatLogRecord(c.format, rec))
 }