redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-11-01 04:11:05 +03:00
Code Activity

Set conn.UsedAt when connection is created. Fixes #263.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-03-04 10:03:50 +02:00
parent 7116858f67
commit 43aade818a
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
conn.go
View File

@@ -8,9 +8,10 @@ import (
const defaultBufSize = 4096
var (
noTimeout = time.Time{}
)
var noTimeout = time.Time{}
// Stubbed in tests.
var now = time.Now
type conn struct {
netcn net.Conn
@@ -32,6 +33,8 @@ func newConnDialer(opt *Options) func() (*conn, error) {
cn := &conn{
netcn: netcn,
buf: make([]byte, defaultBufSize),
UsedAt: now(),
}
cn.rd = bufio.NewReader(cn)
return cn, cn.init(opt)
@@ -76,7 +79,7 @@ func (cn *conn) writeCmds(cmds ...Cmder) error {
}
func (cn *conn) Read(b []byte) (int, error) {
cn.UsedAt = time.Now()
cn.UsedAt = now()
if cn.ReadTimeout != 0 {
cn.netcn.SetReadDeadline(cn.UsedAt.Add(cn.ReadTimeout))
} else {
@@ -86,7 +89,7 @@ func (cn *conn) Read(b []byte) (int, error) {
}
func (cn *conn) Write(b []byte) (int, error) {
cn.UsedAt = time.Now()
cn.UsedAt = now()
if cn.WriteTimeout != 0 {
cn.netcn.SetWriteDeadline(cn.UsedAt.Add(cn.WriteTimeout))
} else {