go-pkg/asynq
2
0
Fork 0
mirror of https://github.com/hibiken/asynq.git synced 2025-10-23 10:16:12 +08:00
Code Issues Projects Releases Wiki Activity

Enable rediss url parsing support

Browse Source
This commit is contained in:
Erwan Leboucher
2022-02-24 13:03:12 +01:00
parent c04fd41653
commit c27684bf15
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
asynq.go
View File

@@ -8,6 +8,7 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"net"
"net/url" "net/url"
"strconv" "strconv"
"strings" "strings"
@@ -430,7 +431,7 @@ func ParseRedisURI(uri string) (RedisConnOpt, error) {
return nil, fmt.Errorf("asynq: could not parse redis uri: %v", err) return nil, fmt.Errorf("asynq: could not parse redis uri: %v", err)
} }
switch u.Scheme { switch u.Scheme {
case "redis": case "redis", "rediss":
return parseRedisURI(u) return parseRedisURI(u)
case "redis-socket": case "redis-socket":
return parseRedisSocketURI(u) return parseRedisSocketURI(u)
@@ -444,6 +445,8 @@ func ParseRedisURI(uri string) (RedisConnOpt, error) {
func parseRedisURI(u *url.URL) (RedisConnOpt, error) { func parseRedisURI(u *url.URL) (RedisConnOpt, error) {
var db int var db int
var err error var err error
var redisConnOpt RedisClientOpt
if len(u.Path) > 0 { if len(u.Path) > 0 {
xs := strings.Split(strings.Trim(u.Path, "/"), "/") xs := strings.Split(strings.Trim(u.Path, "/"), "/")
db, err = strconv.Atoi(xs[0]) db, err = strconv.Atoi(xs[0])
@@ -455,7 +458,20 @@ func parseRedisURI(u *url.URL) (RedisConnOpt, error) {
if v, ok := u.User.Password(); ok { if v, ok := u.User.Password(); ok {
password = v password = v
} }
return RedisClientOpt{Addr: u.Host, DB: db, Password: password}, nil
if u.Scheme == "rediss" {
h, _, err := net.SplitHostPort(u.Host)
if err != nil {
h = u.Host
}
redisConnOpt.TLSConfig = &tls.Config{ServerName: h}
}
redisConnOpt.Addr = u.Host
redisConnOpt.Password = password
redisConnOpt.DB = db
return redisConnOpt, nil
} }
func parseRedisSocketURI(u *url.URL) (RedisConnOpt, error) { func parseRedisSocketURI(u *url.URL) (RedisConnOpt, error) {

8
asynq_test.go
View File

@@ -5,6 +5,7 @@
package asynq package asynq
import ( import (
"crypto/tls"
"flag" "flag"
"sort" "sort"
"strings" "strings"
@@ -12,6 +13,7 @@ import (
"github.com/go-redis/redis/v8" "github.com/go-redis/redis/v8"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
h "github.com/hibiken/asynq/internal/asynqtest" h "github.com/hibiken/asynq/internal/asynqtest"
"github.com/hibiken/asynq/internal/log" "github.com/hibiken/asynq/internal/log"
) )
@@ -99,6 +101,10 @@ func TestParseRedisURI(t *testing.T) {
"redis://localhost:6379", "redis://localhost:6379",
RedisClientOpt{Addr: "localhost:6379"}, RedisClientOpt{Addr: "localhost:6379"},
}, },
{
"rediss://localhost:6379",
RedisClientOpt{Addr: "localhost:6379", TLSConfig: &tls.Config{ServerName: "localhost"}},
},
{ {
"redis://localhost:6379/3", "redis://localhost:6379/3",
RedisClientOpt{Addr: "localhost:6379", DB: 3}, RedisClientOpt{Addr: "localhost:6379", DB: 3},
@@ -151,7 +157,7 @@ func TestParseRedisURI(t *testing.T) {
continue continue
} }
if diff := cmp.Diff(tc.want, got); diff != "" { if diff := cmp.Diff(tc.want, got, cmpopts.IgnoreUnexported(tls.Config{})); diff != "" {
t.Errorf("ParseRedisURI(%q) = %+v, want %+v\n(-want,+got)\n%s", tc.uri, got, tc.want, diff) t.Errorf("ParseRedisURI(%q) = %+v, want %+v\n(-want,+got)\n%s", tc.uri, got, tc.want, diff)
} }
} }