diff --git a/error.go b/error.go index d5ebad60f..8a59913be 100644 --- a/error.go +++ b/error.go @@ -2,6 +2,7 @@ package redis import ( "context" + "errors" "io" "net" "strings" @@ -15,11 +16,11 @@ var ErrClosed = pool.ErrClosed // HasErrorPrefix checks if the err is a Redis error and the message contains a prefix. func HasErrorPrefix(err error, prefix string) bool { - err, ok := err.(Error) - if !ok { + var rErr Error + if !errors.As(err, &rErr) { return false } - msg := err.Error() + msg := rErr.Error() msg = strings.TrimPrefix(msg, "ERR ") // KVRocks adds such prefix return strings.HasPrefix(msg, prefix) } diff --git a/redis_test.go b/redis_test.go index c9d8df6bf..5870fad70 100644 --- a/redis_test.go +++ b/redis_test.go @@ -558,4 +558,24 @@ var _ = Describe("Hook", func() { "hook-1-process-end", })) }) + + It("wrapped error in a hook", func() { + client.AddHook(&hook{ + processHook: func(hook redis.ProcessHook) redis.ProcessHook { + return func(ctx context.Context, cmd redis.Cmder) error { + if err := hook(ctx, cmd); err != nil { + return fmt.Errorf("wrapped error: %w", err) + } + return nil + } + }, + }) + client.ScriptFlush(ctx) + + script := redis.NewScript(`return 'Script and hook'`) + + cmd := script.Run(ctx, client, nil) + Expect(cmd.Err()).NotTo(HaveOccurred()) + Expect(cmd.Val()).To(Equal("Script and hook")) + }) })