gomod/redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
bryan 2024-11-13 12:29:14 +08:00
commit 5a26f88da7
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redis/redis.go
View File

@ -56,6 +56,10 @@ func NewPool(cfg Config) *redis.Pool {
logStdWriter = os.Stdout logStdWriter = os.Stdout
logStdFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile logStdFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile
logStdLogger = log.New(logStdWriter, logStdPrefix, logStdFlags) logStdLogger = log.New(logStdWriter, logStdPrefix, logStdFlags)
logErrPrefix = "ERRO "
logErrWriter = os.Stderr
logErrFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile
logErrLogger = log.New(logErrWriter, logErrPrefix, logErrFlags)
) )
return &redis.Pool{ return &redis.Pool{
MaxIdle: *cfg.MaxIdle, MaxIdle: *cfg.MaxIdle,
@ -65,6 +69,7 @@ func NewPool(cfg Config) *redis.Pool {
Dial: func() (redis.Conn, error) { Dial: func() (redis.Conn, error) {
c, err := redis.Dial("tcp", masterAddr) c, err := redis.Dial("tcp", masterAddr)
if err != nil { if err != nil {
logErrLogger.Output(2, fmt.Sprintf("connect [%s] error: %s", masterAddr, err))
return nil, err return nil, err
} }
@ -76,8 +81,10 @@ func NewPool(cfg Config) *redis.Pool {
} }
if err != nil { if err != nil {
logErrLogger.Output(2, fmt.Sprintf("auth [%s] error: %s", masterAddr, err))
return nil, fmt.Errorf("redis master AUTH failed: <%s>", err.Error()) return nil, fmt.Errorf("redis master AUTH failed: <%s>", err.Error())
} else if okstr != "OK" { } else if okstr != "OK" {
logErrLogger.Output(2, fmt.Sprintf("auth [%s] not return ok but '%s'", masterAddr, okstr))
return nil, fmt.Errorf("redis master AUTH failed: <%s>", okstr) return nil, fmt.Errorf("redis master AUTH failed: <%s>", okstr)
} }

9
sentinel/sentinel.go
View File

@ -121,6 +121,10 @@ func NewPool(cfg Config) *redis.Pool {
logStdWriter = os.Stdout logStdWriter = os.Stdout
logStdFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile logStdFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile
logStdLogger = log.New(logStdWriter, logStdPrefix, logStdFlags) logStdLogger = log.New(logStdWriter, logStdPrefix, logStdFlags)
logErrPrefix = "ERRO "
logErrWriter = os.Stderr
logErrFlags = log.Ldate | log.Lmicroseconds | log.Lshortfile
logErrLogger = log.New(logErrWriter, logErrPrefix, logErrFlags)
) )
return &redis.Pool{ return &redis.Pool{
MaxIdle: *cfg.MaxIdle, MaxIdle: *cfg.MaxIdle,
@ -130,11 +134,13 @@ func NewPool(cfg Config) *redis.Pool {
Dial: func() (redis.Conn, error) { Dial: func() (redis.Conn, error) {
masterAddr, err := sntnl.MasterAddr() masterAddr, err := sntnl.MasterAddr()
if err != nil { if err != nil {
logErrLogger.Output(2, fmt.Sprintf("get master from sentinel error: %s", err))
return nil, err return nil, err
} }
c, err := redis.Dial("tcp", masterAddr) c, err := redis.Dial("tcp", masterAddr)
if err != nil { if err != nil {
logErrLogger.Output(2, fmt.Sprintf("connect [%s] error: %s", masterAddr, err))
return nil, err return nil, err
} }
@ -146,8 +152,10 @@ func NewPool(cfg Config) *redis.Pool {
} }
if err != nil { if err != nil {
logErrLogger.Output(2, fmt.Sprintf("auth [%s] error: %s", masterAddr, err))
return nil, fmt.Errorf("redis master AUTH failed: <%s>", err.Error()) return nil, fmt.Errorf("redis master AUTH failed: <%s>", err.Error())
} else if okstr != "OK" { } else if okstr != "OK" {
logErrLogger.Output(2, fmt.Sprintf("auth [%s] not return ok but '%s'", masterAddr, okstr))
return nil, fmt.Errorf("redis master AUTH failed: <%s>", okstr) return nil, fmt.Errorf("redis master AUTH failed: <%s>", okstr)
} }
@ -156,6 +164,7 @@ func NewPool(cfg Config) *redis.Pool {
err = fmt.Errorf( err = fmt.Errorf(
"master(%s) got by name '%s' is not redis master", "master(%s) got by name '%s' is not redis master",
masterAddr, masterName) masterAddr, masterName)
logErrLogger.Output(2, err.String())
return nil, err return nil, err
} }