Merge pull request #21 from Decentr-net/context-pr

Added helpers to pack logger into a context

context/context.go

@@ -0,0 +1,26 @@
+package context
+
+import (
+	"context"
+
+	"github.com/sirupsen/logrus"
+)
+
+type logCtxKey struct{}
+
+// WithLogger puts logger into a context.
+func WithLogger(parent context.Context, l logrus.FieldLogger) context.Context {
+	return context.WithValue(parent, logCtxKey{}, l)
+}
+
+// GetLogger returns a logger from context.
+// If any logger isn't found, GetLogger returns standard instance of logrus.
+func GetLogger(ctx context.Context) logrus.FieldLogger {
+	l, ok := ctx.Value(logCtxKey{}).(logrus.FieldLogger)
+	if !ok {
+		logrus.Debug("logger is not found in a context")
+		return logrus.StandardLogger()
+	}
+
+	return l
+}

context/context_test.go

@@ -0,0 +1,24 @@
+package context
+
+import (
+	"bytes"
+	"context"
+	"testing"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWithLogger(t *testing.T) {
+	l := logrus.New()
+	b := bytes.NewBufferString("")
+	l.SetOutput(b)
+
+	GetLogger(WithLogger(context.Background(), l)).Info("hi")
+
+	require.NotEmpty(t, b.String())
+}
+
+func TestGetLogger(t *testing.T) {
+	require.NotNil(t, GetLogger(context.Background()))
+}

filename/filename_test.go

@@ -22,6 +22,6 @@ func TestFilenameHook(t *testing.T) {
 	require.NotEqual(t, "", buff.String())
 	require.Equal(t,
 		"filename/filename_test.go:20",
-		gjson.Get(buff.String(), DefaultField).Str,
+		gjson.Get(buff.String(), "_source").Str,
 	)
 }