fix: barry quick fix, 2025-09-06 14:00:45

Author: kooksee

log/impl.log.go

@@ -93,8 +93,11 @@ func (l *loggerImpl) WithFields(m Map) Logger {
 
 func (l *loggerImpl) getCtx(ctxL ...context.Context) context.Context {
 	ctx := context.Background()
-	if len(ctxL) > 0 {
-		ctx = ctxL[0]
+	for i := range ctxL {
+		if ctxL[i] != nil {
+			ctx = ctxL[i]
+			break
+		}
 	}
 	return ctx
 }

v2/result/error.go

@@ -36,6 +36,24 @@ func (e Error) Map(fn func(error) error) Error {
 	return Error{err: err}
 }
 
+func (e Error) LogCtx(ctx context.Context, events ...func(e *zerolog.Event)) Error {
+	if e.IsErr() {
+		err := e.err
+		log.Error(ctx).
+			Func(func(e *zerolog.Event) {
+				for _, fn := range events {
+					fn(e)
+				}
+			}).
+			Str(zerolog.ErrorFieldName, err.Error()).
+			CallerSkipFrame(1).
+			Str("error_id", errors.GetErrorId(err)).
+			Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
+	}
+
+	return e
+}
+
 func (e Error) Log(contexts ...context.Context) Error {
 	if e.IsErr() {
 		log.Error(contexts...).

v2/result/error_test.go

@@ -1,11 +1,16 @@
 package result
 
 import (
+	"github.com/rs/zerolog"
 	"testing"
 
 	"github.com/pubgo/funk/errors"
 )
 
 func TestErrorLog(t *testing.T) {
-	ErrOf(errors.New("test")).Log()
+	ErrOf(errors.New("test")).
+		Log().
+		LogCtx(nil, func(e *zerolog.Event) {
+			e.Str("abc", "test")
+		})
 }

v2/result/proxy_test.go

@@ -9,7 +9,7 @@ import (
 func TestProxy(t *testing.T) {
 	var gErr error
 	var err = ErrProxyOf(&gErr)
-	Errorf("test proxy error").CatchErr(&err)
+	Errorf("test proxy error").Log().CatchErr(&err)
 	assert.NotNil(t, gErr)
 	assert.NotNil(t, err.GetErr())
 	assert.Equal(t, gErr, err.GetErr())

v2/result/result.go

@@ -5,12 +5,13 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/pubgo/funk"
-	"github.com/pubgo/funk/errors"
-	"github.com/pubgo/funk/log"
 	"github.com/rs/zerolog"
 	"github.com/samber/lo"
 	"google.golang.org/protobuf/encoding/prototext"
+
+	"github.com/pubgo/funk"
+	"github.com/pubgo/funk/errors"
+	"github.com/pubgo/funk/log"
 )
 
 var _ Catchable = new(Result[any])
@@ -106,6 +107,24 @@ func (r Result[T]) Inspect(fn func(T)) Result[T] {
 	return r
 }
 
+func (r Result[T]) LogCtx(ctx context.Context, events ...func(e *zerolog.Event)) Result[T] {
+	if r.IsErr() {
+		err := r.err
+		log.Error(ctx).
+			Func(func(e *zerolog.Event) {
+				for _, fn := range events {
+					fn(e)
+				}
+			}).
+			Str(zerolog.ErrorFieldName, err.Error()).
+			CallerSkipFrame(1).
+			Str("error_id", errors.GetErrorId(err)).
+			Msgf("%s\n%s", err.Error(), prototext.Format(errors.ParseErrToPb(err)))
+	}
+
+	return r
+}
+
 func (r Result[T]) Log(contexts ...context.Context) Result[T] {
 	if r.IsErr() {
 		err := r.err

v2/result/result_test.go

@@ -67,8 +67,8 @@ func fn1() (r result.Result[string]) {
 
 func fn2() (r result.Result[string]) {
 	fn3().
-		Map(func(err error) error {
-			return errors.Wrap(err, "test error")
+		InspectErr(func(err error) {
+			log.Err(err).Msg("test error")
 		}).
 		CatchErr(&r)
 	if r.IsErr() {
@@ -79,8 +79,9 @@ func fn2() (r result.Result[string]) {
 }
 
 func fn3() result.Error {
-	return result.ErrOf(fmt.Errorf("error test, this is error")).
-		Inspect(func(err error) {
+	return result.
+		ErrOf(fmt.Errorf("error test, this is error")).
+		InspectErr(func(err error) {
 			log.Err(err).Msg("ddd")
 		}).
 		Log()

v2/result/util.go

@@ -8,12 +8,13 @@ import (
 	"runtime/debug"
 	"strings"
 
+	"github.com/samber/lo"
+	
 	"github.com/pubgo/funk/errors"
 	"github.com/pubgo/funk/generic"
 	"github.com/pubgo/funk/log"
 	"github.com/pubgo/funk/stack"
 	"github.com/pubgo/funk/v2/result/resultchecker"
-	"github.com/samber/lo"
 )
 
 var errFnIsNil = errors.New("[fn] is nil")
@@ -110,7 +111,7 @@ func catchErr(r Error, setter ErrSetter, rawSetter *error, contexts ...context.C
 		}
 
 		if rawSetter != nil {
-			*rawSetter = err
+			setError(ErrProxyOf(rawSetter), err)
 		}
 	}