redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

redis: Log errors instead panic.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2012-08-25 16:47:27 +03:00
parent e993de1033
commit 61134182aa
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
redis.go
View File

@ -2,10 +2,15 @@ package redis
import ( import (
"crypto/tls" "crypto/tls"
"log"
"net" "net"
"os"
"sync" "sync"
) )
// Package logger.
var Logger = log.New(os.Stdout, "redis: ", log.Ldate|log.Ltime)
type OpenConnFunc func() (net.Conn, error) type OpenConnFunc func() (net.Conn, error)
type CloseConnFunc func(net.Conn) error type CloseConnFunc func(net.Conn) error
type InitConnFunc func(*Client) error type InitConnFunc func(*Client) error
@ -80,7 +85,7 @@ func (c *BaseClient) conn() (*Conn, error) {
err = c.InitConn(client) err = c.InitConn(client)
if err != nil { if err != nil {
if err := c.ConnPool.Remove(conn); err != nil { if err := c.ConnPool.Remove(conn); err != nil {
panic(err) Logger.Printf("ConnPool.Remove error: %v", err)
} }
return nil, err return nil, err
} }
@ -106,7 +111,7 @@ func (c *BaseClient) Run(req Req) {
err = c.WriteReq(conn, req) err = c.WriteReq(conn, req)
if err != nil { if err != nil {
if err := c.ConnPool.Remove(conn); err != nil { if err := c.ConnPool.Remove(conn); err != nil {
panic(err) Logger.Printf("ConnPool.Remove error: %v", err)
} }
req.SetErr(err) req.SetErr(err)
return return
@ -116,11 +121,11 @@ func (c *BaseClient) Run(req Req) {
if err != nil { if err != nil {
if err == Nil { if err == Nil {
if err := c.ConnPool.Add(conn); err != nil { if err := c.ConnPool.Add(conn); err != nil {
panic(err) Logger.Printf("ConnPool.Add error: %v", err)
} }
} else { } else {
if err := c.ConnPool.Remove(conn); err != nil { if err := c.ConnPool.Remove(conn); err != nil {
panic(err) Logger.Printf("ConnPool.Remove error: %v", err)
} }
} }
req.SetErr(err) req.SetErr(err)
@ -128,7 +133,7 @@ func (c *BaseClient) Run(req Req) {
} }
if err := c.ConnPool.Add(conn); err != nil { if err := c.ConnPool.Add(conn); err != nil {
panic(err) Logger.Printf("ConnPool.Add error: %v", err)
} }
req.SetVal(val) req.SetVal(val)
} }