Skip to content

Commit d2561b9

Browse files
committed
添加close
1 parent 893a7a2 commit d2561b9

File tree

5 files changed

+18
-0
lines changed

5 files changed

+18
-0
lines changed

interface.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ package redigo
22

33
import (
44
"fmt"
5+
"io"
56
"time"
67

78
"github.com/gomodule/redigo/redis"
89
)
910

1011
type ModeInterface interface {
12+
io.Closer
1113
fmt.Stringer
1214
GetConn() redis.Conn
1315
NewConn() (redis.Conn, error)

mode/alone/alone.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ func (am *aloneMode) NewConn() (redis.Conn, error) {
1616
return am.pool.Dial()
1717
}
1818

19+
func (am *aloneMode) Close() error {
20+
return am.pool.Close()
21+
}
22+
1923
func (am *aloneMode) String() string { return "alone" }
2024

2125
func New(optFuncs ...OptFunc) redigo.ModeInterface {

mode/cluster/cluster.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ func (cm *clusterMode) NewConn() (redis.Conn, error) {
1919
return cm.rc.Dial()
2020
}
2121

22+
func (cm *clusterMode) Close() error {
23+
return cm.rc.Close()
24+
}
25+
2226
func (cm *clusterMode) String() string { return "cluster" }
2327

2428
func New(optFuncs ...OptFunc) redigo.ModeInterface {

mode/sentinel/sentinel.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ func (sm *sentinelMode) NewConn() (redis.Conn, error) {
2222
return sm.pool.Dial()
2323
}
2424

25+
func (sm *sentinelMode) Close() error {
26+
return sm.pool.Close()
27+
}
28+
2529
func (sm *sentinelMode) String() string { return "sentinel" }
2630

2731
func New(optFuncs ...OptFunc) redigo.ModeInterface {

redigo.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ func (c *Client) Mode() string {
2424
return c.mode.String()
2525
}
2626

27+
func (c *Client) Close() error {
28+
return c.mode.Close()
29+
}
30+
2731
func (c *Client) Execute(fn ExecuteFunc) (res interface{}, err error) {
2832
conn := c.mode.GetConn()
2933
defer conn.Close()

0 commit comments

Comments
 (0)