Merge pull request #66 from cdr/rewrite-5

Rewrite V5

Author: nhooyr

example_test.go

@@ -64,6 +64,22 @@ func Example_tracing() {
 	// 2019-12-09 21:59:48.110 [INFO]	<example_test.go:62>	my msg	{"trace": "f143d018d00de835688453d8dc55c9fd", "span": "f214167bf550afc3", "hello": "hi"}
 }
 
+func Example_multiple() {
+	ctx := context.Background()
+	l := sloghuman.Make(os.Stdout)
+
+	f, err := os.OpenFile("stackdriver", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
+	if err != nil {
+		l.Fatal(ctx, "failed to open stackdriver log file", slog.Error(err))
+	}
+
+	l = slog.Make(l, slogstackdriver.Make(f))
+
+	l.Info(ctx, "log to stdout and stackdriver")
+
+	// 2019-12-07 20:59:55.790 [INFO]	<example_test.go:46>	log to stdout and stackdriver
+}
+
 func ExampleWith() {
 	ctx := slog.With(context.Background(), slog.F("field", 1))
 
@@ -82,22 +98,6 @@ func ExampleStdlib() {
 	// 2019-12-07 20:54:23.986 [INFO]	(stdlib)	<example_test.go:29>	msg	{"field": 1}
 }
 
-func ExampleTee() {
-	ctx := context.Background()
-	l := sloghuman.Make(os.Stdout)
-
-	f, err := os.OpenFile("stackdriver", os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
-	if err != nil {
-		l.Fatal(ctx, "failed to open stackdriver log file", slog.Error(err))
-	}
-
-	l = slog.Tee(l, slogstackdriver.Make(f, nil))
-
-	l.Info(ctx, "log to stdout and stackdriver")
-
-	// 2019-12-07 20:59:55.790 [INFO]	<example_test.go:46>	log to stdout and stackdriver
-}
-
 func ExampleLogger_Named() {
 	ctx := context.Background()
 
@@ -108,14 +108,14 @@ func ExampleLogger_Named() {
 	// 2019-12-07 21:20:56.974 [INFO]	(http)	<example_test.go:85>	received request	{"remote address": "127.0.0.1"}
 }
 
-func ExampleLogger_SetLevel() {
+func ExampleLogger_Leveled() {
 	ctx := context.Background()
 
 	l := sloghuman.Make(os.Stdout)
 	l.Debug(ctx, "testing1")
 	l.Info(ctx, "received request")
 
-	l.SetLevel(slog.LevelDebug)
+	l = l.Leveled(slog.LevelDebug)
 
 	l.Debug(ctx, "testing2")
 

export_test.go

@@ -1,13 +1,5 @@
 package slog
 
-var Exits = 0
-var Errors = 0
-
-func init() {
-	exit = func(code int) {
-		Exits++
-	}
-	errorf = func(string, ...interface{}) {
-		Errors++
-	}
+func (l *Logger) SetExit(fn func(int)) {
+	l.exit = fn
 }

internal/entryhuman/json.go

@@ -30,24 +30,13 @@ func formatJSON(w io.Writer, buf []byte) []byte {
 		return buf
 	}
 
-	highlighted, err := colorizeJSON(buf)
-	if err != nil {
-		println("humanfmt: failed to colorize fields JSON: " + err.Error())
-		return buf
-	}
+	highlighted, _ := colorizeJSON(buf)
 	return highlighted
 }
 
 func colorizeJSON(buf []byte) ([]byte, error) {
-	it, err := jsonLexer.Tokenise(nil, string(buf))
-	if err != nil {
-		return nil, err
-	}
-
+	it, _ := jsonLexer.Tokenise(nil, string(buf))
 	b := &bytes.Buffer{}
-	err = formatters.TTY8.Format(b, style, it)
-	if err != nil {
-		return nil, err
-	}
+	formatters.TTY8.Format(b, style, it)
 	return b.Bytes(), nil
 }

internal/syncwriter/syncwriter.go

@@ -3,6 +3,7 @@ package syncwriter
 
 import (
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"sync"
@@ -13,20 +14,28 @@ import (
 type Writer struct {
 	mu sync.Mutex
 	w  io.Writer
+
+	errorf func(f string, v ...interface{})
 }
 
 // New returns a new Writer that writes to w.
 func New(w io.Writer) *Writer {
 	return &Writer{
 		w: w,
+
+		errorf: func(f string, v ...interface{}) {
+			println(fmt.Sprintf(f, v...))
+		},
 	}
 }
 
-// Write implements io.Writer.
-func (w *Writer) Write(p []byte) (int, error) {
+func (w *Writer) Write(name string, p []byte) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
-	return w.w.Write(p)
+	_, err := w.w.Write(p)
+	if err != nil {
+		w.errorf("%v: failed to write entry: %+v", name, err)
+	}
 }
 
 type syncer interface {
@@ -37,13 +46,13 @@ var _ syncer = &os.File{}
 
 // Sync calls Sync on the underlying writer
 // if possible.
-func (w *Writer) Sync() error {
+func (w *Writer) Sync(sinkName string) {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
 	s, ok := w.w.(syncer)
 	if !ok {
-		return nil
+		return
 	}
 	err := s.Sync()
 	if _, ok := w.w.(*os.File); ok {
@@ -53,10 +62,11 @@ func (w *Writer) Sync() error {
 		// See https://github.com/uber-go/zap/issues/370
 		// See https://github.com/cdr/slog/pull/43
 		if errorsIsAny(err, syscall.EINVAL, syscall.ENOTTY, syscall.EBADF) {
-			return nil
+			return
 		}
 	}
-	return err
+
+	w.errorf("failed to sync %v: %+v", sinkName, err)
 }
 
 func errorsIsAny(err error, errs ...error) bool {

internal/syncwriter/syncwriter_test.go

@@ -9,36 +9,50 @@ import (
 	"cdr.dev/slog/internal/assert"
 )
 
+type testWriter struct {
+	w      *Writer
+	errors int
+}
+
 func TestWriter_Sync(t *testing.T) {
 	t.Parallel()
 
+	newWriter := func(w io.Writer) *testWriter {
+		tw := &testWriter{
+			w: New(w),
+		}
+		tw.w.errorf = func(f string, v ...interface{}) {
+			tw.errors++
+		}
+		return tw
+	}
+
 	t.Run("nonSyncWriter", func(t *testing.T) {
 		t.Parallel()
 
-		w := &Writer{}
-		assert.Nil(t, w.Sync(), "syncErr")
+		tw := newWriter(nil)
+		tw.w.Sync("test")
+		assert.Equal(t, 0, tw.errors, "errors")
 	})
 
 	t.Run("syncWriter", func(t *testing.T) {
 		t.Parallel()
 
-		w := &Writer{
-			w: syncWriter{
-				sw: func() error {
-					return io.EOF
-				},
+		tw := newWriter(syncWriter{
+			sw: func() error {
+				return io.EOF
 			},
-		}
-		assert.Equal(t, io.EOF, w.Sync(), "syncErr")
+		})
+		tw.w.Sync("test")
+		assert.Equal(t, 1, tw.errors, "errors")
 	})
 
 	t.Run("stdout", func(t *testing.T) {
 		t.Parallel()
 
-		w := &Writer{
-			w: os.Stdout,
-		}
-		assert.Success(t, w.Sync(), "syncErr")
+		tw := newWriter(os.Stdout)
+		tw.w.Sync("test")
+		assert.Equal(t, 0, tw.errors, "errors")
 	})
 }
 

s_test.go

@@ -14,7 +14,7 @@ func TestStdlib(t *testing.T) {
 	t.Parallel()
 
 	b := &bytes.Buffer{}
-	l := sloghuman.Make(b).With(
+	l := slog.Make(sloghuman.Make(b)).With(
 		slog.F("hi", "we"),
 	)
 	stdlibLog := slog.Stdlib(bg, l)