re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2119 from szyhf/szyhf-patch-1 

fix: #2114 for redis-server not support Hello
This commit is contained in:
Vladimir Mihailenco 2022-06-12 10:48:59 +03:00 committed by GitHub
parent 4ddd7d1803 b6d2a92529
commit 25db55cdc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
redis.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
"strings"
"sync/atomic" "sync/atomic"
"time" "time"
@ -228,11 +229,11 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
var auth bool var auth bool
// For redis-server <6.0 that does not support the Hello command, // For redis-server < 6.0 that does not support the Hello command,
// we continue to provide services with RESP2. // we continue to provide services with RESP2.
if err := conn.Hello(ctx, 3, username, password, "").Err(); err == nil { if err := conn.Hello(ctx, 3, username, password, "").Err(); err == nil {
auth = true auth = true
} else if err.Error() != "ERR unknown command 'hello'" { } else if !strings.HasPrefix(err.Error(), "ERR unknown command") {
return err return err
} }