Return L() if no logger is found in the context

Author: mitchellh

context.go

@@ -19,10 +19,15 @@ func WithContext(ctx context.Context, logger Logger, args ...interface{}) contex
 	return context.WithValue(ctx, contextKey, logger)
 }
 
-// FromContext returns a logger from the context. This will return nil
-// if there is no logger in the context.
+// FromContext returns a logger from the context. This will return L()
+// (the default logger) if no logger is found in the context. Therefore,
+// this will never return a nil value.
 func FromContext(ctx context.Context) Logger {
 	logger, _ := ctx.Value(contextKey).(Logger)
+	if logger == nil {
+		return L()
+	}
+
 	return logger
 }
 

context_test.go

@@ -14,6 +14,10 @@ func TestContext_simpleLogger(t *testing.T) {
 	require.Equal(t, l, FromContext(ctx))
 }
 
+func TestContext_empty(t *testing.T) {
+	require.Equal(t, L(), FromContext(context.Background()))
+}
+
 func TestContext_fields(t *testing.T) {
 	var buf bytes.Buffer
 	l := New(&LoggerOptions{