Skip to content
Open
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
2 changes: 2 additions & 0 deletions changelog/haoshengzhen-redis-sentinel-default-port.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Fixed
- Default missing Redis Sentinel ports per address when parsing `redis+sentinel` URLs.
2 changes: 1 addition & 1 deletion util/redisutil/redisutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func getAddressesWithDefaults(u *url.URL) []string {
for _, urlHost := range urlHosts {
host, port, err := net.SplitHostPort(urlHost)
if err != nil {
host = u.Host
host = strings.TrimPrefix(strings.TrimSuffix(urlHost, "]"), "[")
}
if host == "" {
host = "localhost"
Expand Down
21 changes: 21 additions & 0 deletions util/redisutil/redisutil_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2021-2026, Offchain Labs, Inc.
// For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE.md

package redisutil

import (
"reflect"
"testing"
)

func TestParseFailoverRedisUrlDefaultsPortPerAddress(t *testing.T) {
options, err := parseFailoverRedisUrl("redis+sentinel://sentinel-1,sentinel-2:26379/master")
if err != nil {
t.Fatal(err)
}

want := []string{"sentinel-1:6379", "sentinel-2:26379"}
if !reflect.DeepEqual(options.SentinelAddrs, want) {
t.Fatalf("unexpected sentinel addrs: have %v, want %v", options.SentinelAddrs, want)
}
}
Loading