Merge pull request #110 from go-redis/fix/redis-string-meth

Add Client.String method.
This commit is contained in:
Vladimir Mihailenco 2015-05-18 15:18:55 +03:00
commit cdfab22180
3 changed files with 11 additions and 2 deletions

View File

@ -31,11 +31,9 @@ var _ = Describe("ClusterClient", func() {
}
BeforeEach(func() {
var err error
subject = NewClusterClient(&ClusterOptions{
Addrs: []string{"127.0.0.1:6379", "127.0.0.1:7003", "127.0.0.1:7006"},
})
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {

View File

@ -1,6 +1,7 @@
package redis // import "gopkg.in/redis.v3"
import (
"fmt"
"log"
"net"
"time"
@ -11,6 +12,10 @@ type baseClient struct {
opt *options
}
func (c *baseClient) String() string {
return fmt.Sprintf("Redis<%s db:%d>", c.opt.Addr, c.opt.DB)
}
func (c *baseClient) conn() (*conn, error) {
return c.connPool.Get()
}
@ -164,6 +169,7 @@ func (opt *Options) getPoolTimeout() time.Duration {
func (opt *Options) options() *options {
return &options{
Addr: opt.Addr,
Dialer: opt.getDialer(),
PoolSize: opt.getPoolSize(),
PoolTimeout: opt.getPoolTimeout(),
@ -181,6 +187,7 @@ func (opt *Options) options() *options {
}
type options struct {
Addr string
Dialer func() (net.Conn, error)
PoolSize int
PoolTimeout time.Duration

View File

@ -24,6 +24,10 @@ var _ = Describe("Client", func() {
client.Close()
})
It("should Stringer", func() {
Expect(client.String()).To(Equal("Redis<:6380 db:0>"))
})
It("should ping", func() {
val, err := client.Ping().Result()
Expect(err).NotTo(HaveOccurred())