mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1159 from go-redis/fix/bad-state-details 

internal/pool: include details when conn is in a bad state
This commit is contained in:
Vladimir Mihailenco 2019-09-13 17:32:06 +03:00 committed by GitHub
parent 2a480cc543 a2de1fe668
commit e2c6acad22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/pool/pool_single.go
View File

@ -19,7 +19,11 @@ type BadConnError struct {
var _ error = (*BadConnError)(nil) var _ error = (*BadConnError)(nil)
func (e BadConnError) Error() string { func (e BadConnError) Error() string {
return "pg: Conn is in a bad state" s := "redis: Conn is in a bad state"
if e.wrapped != nil {
s += ": " + e.wrapped.Error()
}
return s
} }
func (e BadConnError) Unwrap() error { func (e BadConnError) Unwrap() error {
@ -94,7 +98,7 @@ func (p *SingleConnPool) Get(ctx context.Context) (*Conn, error) {
panic("not reached") panic("not reached")
} }
} }
return nil, fmt.Errorf("pg: SingleConnPool.Get: infinite loop") return nil, fmt.Errorf("redis: SingleConnPool.Get: infinite loop")
} }
func (p *SingleConnPool) Put(cn *Conn) { func (p *SingleConnPool) Put(cn *Conn) {
@ -166,7 +170,7 @@ func (p *SingleConnPool) Close() error {
} }
} }
return fmt.Errorf("pg: SingleConnPool.Close: infinite loop") return fmt.Errorf("redis: SingleConnPool.Close: infinite loop")
} }
func (p *SingleConnPool) Reset() error { func (p *SingleConnPool) Reset() error {
@ -182,12 +186,12 @@ func (p *SingleConnPool) Reset() error {
p.pool.Remove(cn, ErrClosed) p.pool.Remove(cn, ErrClosed)
p._badConnError.Store(BadConnError{wrapped: nil}) p._badConnError.Store(BadConnError{wrapped: nil})
default: default:
return fmt.Errorf("pg: SingleConnPool does not have a Conn") return fmt.Errorf("redis: SingleConnPool does not have a Conn")
} }
if !atomic.CompareAndSwapUint32(&p.state, stateInited, stateDefault) { if !atomic.CompareAndSwapUint32(&p.state, stateInited, stateDefault) {
state := atomic.LoadUint32(&p.state) state := atomic.LoadUint32(&p.state)
return fmt.Errorf("pg: invalid SingleConnPool state: %d", state) return fmt.Errorf("redis: invalid SingleConnPool state: %d", state)
} }
return nil return nil