Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions export_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,7 @@ func (c *ModuleLoadexConfig) ToArgs() []interface{} {
func ShouldRetry(err error, retryTimeout bool) bool {
return shouldRetry(err, retryTimeout)
}

func JoinErrors(errs []error) string {
return joinErrors(errs)
}
9 changes: 8 additions & 1 deletion sentinel.go
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,11 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
}
}

// short circuit if no sentinels configured
if len(c.sentinelAddrs) == 0 {
return "", errors.New("redis: no sentinels configured")
}

var (
masterAddr string
wg sync.WaitGroup
Expand Down Expand Up @@ -890,10 +895,12 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
}

func joinErrors(errs []error) string {
if len(errs) == 0 {
return ""
}
if len(errs) == 1 {
return errs[0].Error()
}

b := []byte(errs[0].Error())
for _, err := range errs[1:] {
b = append(b, '\n')
Expand Down
96 changes: 96 additions & 0 deletions sentinel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -682,3 +682,99 @@ func compareSlices(t *testing.T, a, b []string, name string) {
}
}
}

type joinErrorsTest struct {
name string
errs []error
expected string
}

func TestJoinErrors(t *testing.T) {
tests := []joinErrorsTest{
{
name: "empty slice",
errs: []error{},
expected: "",
},
{
name: "single error",
errs: []error{errors.New("first error")},
expected: "first error",
},
{
name: "two errors",
errs: []error{errors.New("first error"), errors.New("second error")},
expected: "first error\nsecond error",
},
{
name: "multiple errors",
errs: []error{
errors.New("first error"),
errors.New("second error"),
errors.New("third error"),
},
expected: "first error\nsecond error\nthird error",
},
{
name: "nil slice",
errs: nil,
expected: "",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := redis.JoinErrors(tt.errs)
if result != tt.expected {
t.Errorf("joinErrors() = %q, want %q", result, tt.expected)
}
})
}
}

func BenchmarkJoinErrors(b *testing.B) {
benchmarks := []joinErrorsTest{
{
name: "empty slice",
errs: []error{},
expected: "",
},
{
name: "single error",
errs: []error{errors.New("first error")},
expected: "first error",
},
{
name: "two errors",
errs: []error{errors.New("first error"), errors.New("second error")},
expected: "first error\nsecond error",
},
{
name: "multiple errors",
errs: []error{
errors.New("first error"),
errors.New("second error"),
errors.New("third error"),
},
expected: "first error\nsecond error\nthird error",
},
{
name: "nil slice",
errs: nil,
expected: "",
},
}
for _, bm := range benchmarks {
b.Run(bm.name, func(b *testing.B) {
b.ResetTimer()
b.RunParallel(func(pb *testing.PB) {
for pb.Next() {
result := redis.JoinErrors(bm.errs)
if result != bm.expected {
b.Errorf("joinErrors() = %q, want %q", result, bm.expected)
}
}
})
})
}
}
Loading