Broke some windows builds.

Bring back doFmtVerbLevelColor

Author: Steve Sanders

examples/example.go

@@ -27,7 +27,8 @@ func main() {
 	// For demo purposes, create two backend for os.Stderr.
 	backend1 := logging.NewLogBackend(os.Stderr, "", 0)
 	backend2 := logging.NewLogBackend(os.Stderr, "", 0)
-
+	backend1.Color = true
+	backend2.Color = true
 	// For messages written to backend2 we want to add some additional
 	// information to the output, including the used log level and the name of
 	// the function.

log.go

@@ -0,0 +1,63 @@
+// Copyright 2013, Örjan Persson. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package logging
+
+import (
+	"fmt"
+	"io"
+)
+
+// TODO initialize here
+var colors []string
+var boldcolors []string
+
+type color int
+
+const (
+	colorBlack = iota + 30
+	colorRed
+	colorGreen
+	colorYellow
+	colorBlue
+	colorMagenta
+	colorCyan
+	colorWhite
+)
+
+func init_colors() {
+	colors = []string{
+		CRITICAL: colorSeq(colorMagenta),
+		ERROR:    colorSeq(colorRed),
+		WARNING:  colorSeq(colorYellow),
+		NOTICE:   colorSeq(colorGreen),
+		DEBUG:    colorSeq(colorCyan),
+	}
+	boldcolors = []string{
+		CRITICAL: colorSeqBold(colorMagenta),
+		ERROR:    colorSeqBold(colorRed),
+		WARNING:  colorSeqBold(colorYellow),
+		NOTICE:   colorSeqBold(colorGreen),
+		DEBUG:    colorSeqBold(colorCyan),
+	}
+}
+
+func colorSeq(color color) string {
+	return fmt.Sprintf("\033[%dm", int(color))
+}
+
+func colorSeqBold(color color) string {
+	return fmt.Sprintf("\033[%d;1m", int(color))
+}
+
+func doFmtVerbLevelColor(layout string, level Level, output io.Writer) {
+	if layout == "bold" {
+		output.Write([]byte(boldcolors[level]))
+	} else if layout == "reset" {
+		output.Write([]byte("\033[0m"))
+	} else {
+		output.Write([]byte(colors[level]))
+	}
+}
+

log_nix.go

@@ -8,28 +8,10 @@ package logging
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"log"
 )
 
-// TODO initialize here
-var colors []string
-var boldcolors []string
-
-type color int
-
-const (
-	colorBlack = iota + 30
-	colorRed
-	colorGreen
-	colorYellow
-	colorBlue
-	colorMagenta
-	colorCyan
-	colorWhite
-)
-
 // LogBackend utilizes the standard log module.
 type LogBackend struct {
 	Logger *log.Logger
@@ -56,37 +38,7 @@ func (b *LogBackend) Log(level Level, calldepth int, rec *Record) error {
 	return b.Logger.Output(calldepth+2, rec.Formatted(calldepth+1))
 }
 
-func colorSeq(color color) string {
-	return fmt.Sprintf("\033[%dm", int(color))
-}
-
-func colorSeqBold(color color) string {
-	return fmt.Sprintf("\033[%d;1m", int(color))
-}
 
 func init() {
-	colors = []string{
-		CRITICAL: colorSeq(colorMagenta),
-		ERROR:    colorSeq(colorRed),
-		WARNING:  colorSeq(colorYellow),
-		NOTICE:   colorSeq(colorGreen),
-		DEBUG:    colorSeq(colorCyan),
-	}
-	boldcolors = []string{
-		CRITICAL: colorSeqBold(colorMagenta),
-		ERROR:    colorSeqBold(colorRed),
-		WARNING:  colorSeqBold(colorYellow),
-		NOTICE:   colorSeqBold(colorGreen),
-		DEBUG:    colorSeqBold(colorCyan),
-	}
-}
-
-func doFmtVerbLevelColor(layout string, level Level, output io.Writer) {
-	if layout == "bold" {
-		output.Write([]byte(boldcolors[level]))
-	} else if layout == "reset" {
-		output.Write([]byte("\033[0m"))
-	} else {
-		output.Write([]byte(colors[level]))
-	}
-}
+	init_colors()
+}

log_windows.go

@@ -9,20 +9,23 @@ import (
 	"bytes"
 	"io"
 	"log"
-	"os"
 	"syscall"
 )
 
+type FileDescriptorGetter interface {
+	Fd() uintptr
+}
+
 var (
 	kernel32DLL                 = syscall.NewLazyDLL("kernel32.dll")
 	setConsoleTextAttributeProc = kernel32DLL.NewProc("SetConsoleTextAttribute")
 )
 
 // TODO initialize here
-var colors []WORD
-var boldcolors []WORD
+var win_colors []WORD
+var win_boldcolors []WORD
+
 
-type color int
 type WORD uint16
 
 const (
@@ -51,14 +54,18 @@ type LogBackend struct {
 }
 
 // NewLogBackend creates a new LogBackend.
-func NewLogBackend(out *os.File, prefix string, flag int) *LogBackend {
-	return &LogBackend{Logger: log.New(out, prefix, flag), Handle: out.Fd()}
+func NewLogBackend(out io.Writer, prefix string, flag int) *LogBackend {
+	var handle uintptr
+	if fdg, ok := interface{}(out).(FileDescriptorGetter); ok {
+		handle = fdg.Fd()
+	}
+	return &LogBackend{Logger: log.New(out, prefix, flag), Handle: handle}
 }
 
 func (b *LogBackend) Log(level Level, calldepth int, rec *Record) error {
 	if b.Color {
 		buf := &bytes.Buffer{}
-		setConsoleTextAttribute(b.Handle, colors[level])
+		setConsoleTextAttribute(b.Handle, win_colors[level])
 		buf.Write([]byte(rec.Formatted(calldepth + 1)))
 		// For some reason, the Go logger arbitrarily decided "2" was the correct
 		// call depth...
@@ -70,15 +77,16 @@ func (b *LogBackend) Log(level Level, calldepth int, rec *Record) error {
 }
 
 func init() {
-	colors = []WORD{
+	init_colors()
+	win_colors = []WORD{
 		INFO:     fgWhite,
 		CRITICAL: fgMagenta,
 		ERROR:    fgRed,
 		WARNING:  fgYellow,
 		NOTICE:   fgGreen,
 		DEBUG:    fgCyan,
 	}
-	boldcolors = []WORD{
+	win_boldcolors = []WORD{
 		INFO:     fgWhite | fgIntensity,
 		CRITICAL: fgMagenta | fgIntensity,
 		ERROR:    fgRed | fgIntensity,
@@ -115,6 +123,3 @@ func checkError(r1, r2 uintptr, err error) error {
 // Calling use(p) ensures that p is kept live until that point.
 func use(p interface{}) {}
 
-func doFmtVerbLevelColor(layout string, level Level, output io.Writer) {
-	// no-op for now. We need the file descriptor to do colors.
-}