From 19db59c12f75a5d7e9b13f63158e91e927578b0c Mon Sep 17 00:00:00 2001 From: kozmod Date: Sat, 28 Oct 2023 19:12:42 +0300 Subject: [PATCH] [feature] fix error msg --- transactor.go | 8 ++++---- transactor_test.go | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/transactor.go b/transactor.go index b6048a7..8243fac 100644 --- a/transactor.go +++ b/transactor.go @@ -67,14 +67,14 @@ func (t *Transactor[B, C, O]) WithinTx(ctx context.Context, fn func(ctx context. func (t *Transactor[B, C, O]) WithinTxWithOpts(ctx context.Context, fn func(ctx context.Context) error, opts ...Option[O]) (err error) { var nilDB B if t.beginner == nilDB { - return xerrors.Errorf("transactor: cannot begin: %w", ErrNilBeginner) + return xerrors.Errorf("transactor - cannot begin: %w", ErrNilBeginner) } tx, ok := t.operator.Extract(ctx) if !ok { tx, err = t.beginner.BeginTx(ctx, opts...) if err != nil { - return xerrors.Errorf("transactor: cannot begin: %w", errors.Join(err, ErrBeginTx)) + return xerrors.Errorf("transactor - cannot begin: %w", errors.Join(err, ErrBeginTx)) } } @@ -82,10 +82,10 @@ func (t *Transactor[B, C, O]) WithinTxWithOpts(ctx context.Context, fn func(ctx switch p := recover(); { case p != nil: if rbErr := tx.Rollback(ctx); rbErr != nil { - err = xerrors.Errorf("transactor: panic: %v: %w", p, errors.Join(rbErr, ErrRollbackFailed)) + err = xerrors.Errorf("transactor - panic [%v]: %w", p, errors.Join(rbErr, ErrRollbackFailed)) return } - err = xerrors.Errorf("transactor: panic: %v: %w", p, ErrRollbackSuccess) + err = xerrors.Errorf("transactor - panic [%v]: %w", p, ErrRollbackSuccess) case err != nil: if rbErr := tx.Rollback(ctx); rbErr != nil { err = xerrors.Errorf("transactor: %w", errors.Join(err, rbErr, ErrRollbackFailed)) diff --git a/transactor_test.go b/transactor_test.go index ecf9565..556dea9 100644 --- a/transactor_test.go +++ b/transactor_test.go @@ -231,7 +231,6 @@ func Test_Transactor(t *testing.T) { assertTrue(t, &c == tx) return execError }) - t.Log(err.Error()) assertTrue(t, errors.Is(err, ErrRollbackFailed)) assertTrue(t, errors.Is(err, execError)) assertTrue(t, errors.Is(err, rollbackErr))