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

Remove atomic.Value.Store(nil)

This commit is contained in:
Vladimir Mihailenco 2019-08-08 14:04:19 +03:00
parent 3ad2955728
commit e0fed4d581
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/pool/pool_single.go
View File

@ -16,6 +16,8 @@ type BadConnError struct {
wrapped error wrapped error
} }
var _ error = (*BadConnError)(nil)
func (e BadConnError) Error() string { func (e BadConnError) Error() string {
return "pg: Conn is in a bad state" return "pg: Conn is in a bad state"
} }
@ -178,7 +180,7 @@ func (p *SingleConnPool) Reset() error {
return ErrClosed return ErrClosed
} }
p.pool.Remove(cn, ErrClosed) p.pool.Remove(cn, ErrClosed)
p._badConnError.Store(nil) p._badConnError.Store(BadConnError{wrapped: nil})
default: default:
return fmt.Errorf("pg: SingleConnPool does not have a Conn") return fmt.Errorf("pg: SingleConnPool does not have a Conn")
} }
@ -193,7 +195,10 @@ func (p *SingleConnPool) Reset() error {
func (p *SingleConnPool) badConnError() error { func (p *SingleConnPool) badConnError() error {
if v := p._badConnError.Load(); v != nil { if v := p._badConnError.Load(); v != nil {
return v.(BadConnError) err := v.(BadConnError)
if err.wrapped != nil {
return err
}
} }
return nil return nil
} }