mirror of
https://github.com/hibiken/asynq.git
synced 2026-04-30 17:15:53 +08:00
Compare commits
2 Commits
dependabot
...
pr-1100
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0a9dd34460 | ||
|
|
07898eade0 |
13
asynq.go
13
asynq.go
@@ -471,7 +471,7 @@ func (opt RedisClusterClientOpt) MakeRedisClient() interface{} {
|
|||||||
// redis://[:password@]host[:port][/dbnumber]
|
// redis://[:password@]host[:port][/dbnumber]
|
||||||
// rediss://[:password@]host[:port][/dbnumber]
|
// rediss://[:password@]host[:port][/dbnumber]
|
||||||
// redis-socket://[:password@]path[?db=dbnumber]
|
// redis-socket://[:password@]path[?db=dbnumber]
|
||||||
// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][?master=masterName]
|
// redis-sentinel://[:password@]host1[:port][,host2:[:port]][,hostN:[:port]][/dbnumber][?master=masterName]
|
||||||
func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
func ParseRedisURI(uri string) (RedisConnOpt, error) {
|
||||||
u, err := url.Parse(uri)
|
u, err := url.Parse(uri)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -545,11 +545,20 @@ func parseRedisSocketURI(u *url.URL) (RedisConnOpt, error) {
|
|||||||
func parseRedisSentinelURI(u *url.URL) (RedisConnOpt, error) {
|
func parseRedisSentinelURI(u *url.URL) (RedisConnOpt, error) {
|
||||||
addrs := strings.Split(u.Host, ",")
|
addrs := strings.Split(u.Host, ",")
|
||||||
master := u.Query().Get("master")
|
master := u.Query().Get("master")
|
||||||
|
var db int
|
||||||
|
var err error
|
||||||
|
if len(u.Path) > 0 {
|
||||||
|
xs := strings.Split(strings.Trim(u.Path, "/"), "/")
|
||||||
|
db, err = strconv.Atoi(xs[0])
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("asynq: could not parse redis sentinel uri: database number should be the first segment of the path")
|
||||||
|
}
|
||||||
|
}
|
||||||
var password string
|
var password string
|
||||||
if v, ok := u.User.Password(); ok {
|
if v, ok := u.User.Password(); ok {
|
||||||
password = v
|
password = v
|
||||||
}
|
}
|
||||||
return RedisFailoverClientOpt{MasterName: master, SentinelAddrs: addrs, SentinelPassword: password}, nil
|
return RedisFailoverClientOpt{MasterName: master, SentinelAddrs: addrs, SentinelPassword: password, DB: db}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResultWriter is a client interface to write result data for a task.
|
// ResultWriter is a client interface to write result data for a task.
|
||||||
|
|||||||
@@ -146,6 +146,24 @@ func TestParseRedisURI(t *testing.T) {
|
|||||||
MasterName: "mymaster",
|
MasterName: "mymaster",
|
||||||
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
||||||
SentinelPassword: "mypassword",
|
SentinelPassword: "mypassword",
|
||||||
|
DB: 0,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"redis-sentinel://localhost:5000,localhost:5001,localhost:5002/3?master=mymaster",
|
||||||
|
RedisFailoverClientOpt{
|
||||||
|
MasterName: "mymaster",
|
||||||
|
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
||||||
|
DB: 3,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"redis-sentinel://:mypassword@localhost:5000,localhost:5001,localhost:5002/7?master=mymaster",
|
||||||
|
RedisFailoverClientOpt{
|
||||||
|
MasterName: "mymaster",
|
||||||
|
SentinelAddrs: []string{"localhost:5000", "localhost:5001", "localhost:5002"},
|
||||||
|
SentinelPassword: "mypassword",
|
||||||
|
DB: 7,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -188,6 +206,10 @@ func TestParseRedisURIErrors(t *testing.T) {
|
|||||||
"non integer for db numbers for socket",
|
"non integer for db numbers for socket",
|
||||||
"redis-socket:///some/path/to/redis?db=one",
|
"redis-socket:///some/path/to/redis?db=one",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"non integer for db number for sentinel",
|
||||||
|
"redis-sentinel://localhost:5000/abc?master=mymaster",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range tests {
|
for _, tc := range tests {
|
||||||
|
|||||||
Reference in New Issue
Block a user