chore: refactor redis (#3844)

master
Kevin Wan 10 months ago committed by GitHub
parent 368caa7608
commit 9e33b557b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,6 +2,7 @@ package redis
import ( import (
"context" "context"
"errors"
"io" "io"
"net" "net"
"strings" "strings"
@ -29,7 +30,6 @@ var (
type hook struct{} type hook struct{}
func (h hook) DialHook(next red.DialHook) red.DialHook { func (h hook) DialHook(next red.DialHook) red.DialHook {
// no need to implement
return next return next
} }
@ -84,22 +84,23 @@ func (h hook) ProcessPipelineHook(next red.ProcessPipelineHook) red.ProcessPipel
} }
func formatError(err error) string { func formatError(err error) string {
if err == nil || err == red.Nil { if err == nil || errors.Is(err, red.Nil) {
return "" return ""
} }
opErr, ok := err.(*net.OpError) var opErr *net.OpError
ok := errors.As(err, &opErr)
if ok && opErr.Timeout() { if ok && opErr.Timeout() {
return "timeout" return "timeout"
} }
switch err { switch {
case io.EOF: case err == io.EOF:
return "eof" return "eof"
case context.DeadlineExceeded: case errors.Is(err, context.DeadlineExceeded):
return "context deadline" return "context deadline"
case breaker.ErrServiceUnavailable: case errors.Is(err, breaker.ErrServiceUnavailable):
return "breaker" return "breaker open"
default: default:
return "unexpected error" return "unexpected error"
} }
@ -140,7 +141,7 @@ func (h hook) startSpan(ctx context.Context, cmds ...red.Cmder) (context.Context
return ctx, func(err error) { return ctx, func(err error) {
defer span.End() defer span.End()
if err == nil || err == red.Nil { if err == nil || errors.Is(err, red.Nil) {
span.SetStatus(codes.Ok, "") span.SetStatus(codes.Ok, "")
return return
} }

@ -138,7 +138,7 @@ func TestFormatError(t *testing.T) {
assert.Equal(t, "context deadline", formatError(context.DeadlineExceeded)) assert.Equal(t, "context deadline", formatError(context.DeadlineExceeded))
// Test case: err is breaker.ErrServiceUnavailable // Test case: err is breaker.ErrServiceUnavailable
assert.Equal(t, "breaker", formatError(breaker.ErrServiceUnavailable)) assert.Equal(t, "breaker open", formatError(breaker.ErrServiceUnavailable))
// Test case: err is unknown // Test case: err is unknown
assert.Equal(t, "unexpected error", formatError(errors.New("some error"))) assert.Equal(t, "unexpected error", formatError(errors.New("some error")))

Loading…
Cancel
Save