first commit

陆恒
1 parent 0aff5f86
Showing 46 changed files with 8351 additions and 0 deletions Show diff stats
.gitignore
src/HttpServer/conf/conf.go
src/HttpServer/conf/world.xml
src/HttpServer/logic/datadef.go
src/HttpServer/logic/httpserver.go
src/HttpServer/logic/logic.go
src/HttpServer/main/main.go
src/HttpServer/redishandler/redishandler.go
src/common/beegomap/beegomap.go
src/common/logger/logger.go
src/common/redis/def.go
src/common/redis/pubsub.go
src/common/redis/redis.go
src/github.com/garyburd.zip
src/github.com/garyburd/redigo/.github/CONTRIBUTING.md
src/github.com/garyburd/redigo/.github/ISSUE_TEMPLATE.md
src/github.com/garyburd/redigo/.travis.yml
src/github.com/garyburd/redigo/LICENSE
src/github.com/garyburd/redigo/README.markdown
src/github.com/garyburd/redigo/internal/commandinfo.go
@@ -0,0 +1,2 @@
+*.txt
+.idea/
 \ No newline at end of file
@@ -0,0 +1,57 @@
+package conf
+
+import (
+	"encoding/xml"
+	"io/ioutil"
+	_ "strings"
+
+	"common/logger"
+)
+
+type RedisConf struct {
+	Host     string `xml:",attr"`
+	Db       uint32 `xml:",attr"`
+	Password string `xml:",attr"`
+}
+
+type TexasConf struct {
+	ServerHttpAddr ServerHttpAddrConf `xml:"ServerHttpAddr"`
+	Redis          RedisConf          `xml:"Redis"`
+}
+
+var (
+	config = new(TexasConf)
+)
+
+func GetRedisConf() RedisConf {
+	return config.Redis
+}
+
+func LoadConf(filename string) error {
+	content, err := ioutil.ReadFile(filename)
+	if err != nil {
+		logger.Notic("read file:%v error:", filename, err)
+		return err
+	}
+	logger.Info("conf xml:%v", string(content))
+	err = xml.Unmarshal(content, config)
+	if err != nil {
+		logger.Notic("decode xml error:%v", err)
+		return err
+	}
+	DumpConf()
+	return nil
+}
+
+func DumpConf() {
+	logger.Info("--------------config dump----start--------")
+	logger.Info("--------------config dump----end--------")
+}
+
+func GetServerHttpAddrConf() string {
+	return config.ServerHttpAddr.Host
+}
+
+type ServerHttpAddrConf struct {
+	Host string `xml:",attr"`
+}
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Config>
+    <ServerHttpAddr Host="127.0.0.1:50056" />
+    <Redis Host="172.21.0.25:6379" Db="6" Password="crs-lzslccdc:redis@YXp8Jk#MV" />
+</Config>
 \ No newline at end of file
@@ -0,0 +1,456 @@
+package logic
+
+type UserLoginData struct {
+	//Uuid      int `json:"uuid"`
+	Fromid    int `json:"fromid"`
+	Sharetype int `json:"sharetype"`
+}
+
+type UserLoginResp struct {
+	Code         int        `json:"code"`
+	Message      string     `json:"message"`
+	Gold         int64      `json:"gold"`
+	Love         int64      `json:"love"`
+	Goldrate     int64      `json:"goldrate"`
+	Loverate     int64      `json:"loverate"`
+	Highestlv    int        `json:"highestlv"`
+	Curboxlv     int        `json:"curboxlv"`
+	Isdoublegold int        `json:"isdoublegold"`
+	Isauto       int        `json:"isauto"`
+	Offlinegold  int64      `json:"offlinegold"`
+	Offlinelove  int64      `json:"offlinelove"`
+	Data         []DataDesc `json:"data"`
+}
+
+type GetUserDataReq struct {
+	//Uuid int `json:"uuid"`
+}
+
+type GetUserDataResp struct {
+	Code               int    `json:"code"`
+	Message            string `json:"message"`
+	Gold               int64  `json:"gold"`
+	Love               int64  `json:"love"`
+	Dougoldlefttime    int    `json:"dougoldlefttime"`
+	Automlefttime      int    `json:"automlefttime"`
+	Acclcteboxlefttime int    `json:"acclcteboxlefttime"`
+	Israndgift         int    `json:"israndgift"`
+}
+
+type DataDesc struct {
+	Pos       int `json:"pos"`
+	Catlv     int `json:"cat_lv"`
+	Countdown int `json:"countdown"`
+}
+
+type ExchangePosReq struct {
+	//Uuid  int `json:"uuid"`
+	Pos_1 int `json:"pos_1"`
+	Pos_2 int `json:"pos_2"`
+}
+
+type ExchangePosResp struct {
+	Code       int    `json:"code"`
+	Message    string `json:"message"`
+	Pos1_lv    int    `json:"pos1_lv"`
+	Pos2_lv    int    `json:"pos2_lv"`
+	Highest_lv int    `json:"highest_lv"`
+	Add_num    int    `json:"add_num"`
+}
+
+type ClickBoxReq struct {
+	//Uuid int `json:"uuid"`
+	Pos int `json:"pos"`
+}
+
+type ClickBoxResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Pos     int    `json:"pos"`
+	Lv      int    `json:"lv"`
+}
+
+type UpgradeBoxReq struct {
+	//Uuid int `json:"uuid"`
+}
+type UpgradeBoxResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Boxlv   int    `json:"boxlv"`
+}
+
+type GenerateBoxReq struct {
+	//Uuid int `json:"uuid"`
+	Pos int `json:"pos"`
+}
+
+type GenerateBoxResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type AcclecteReq struct {
+	//Uuid int `json:"uuid"`
+}
+type AcclecteResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type AcclecteBoxResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type AutomergeReq struct {
+	//Uuid int `json:"uuid"`
+}
+type AutomergeResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type QueryBuyCatReq struct {
+	//Uuid int `json:"uuid"`
+}
+type QueryBuyCatResp struct {
+	Code     int          `json:"code"`
+	Message  string       `json:"message"`
+	Maxcatlv int          `json:"maxcatlv"`
+	Data     []BuyCatDesc `json:"data"`
+}
+
+type BuyCatDesc struct {
+	Lv      int   `json:"lv"`
+	Goldnum int64 `json:"goldnum"`
+}
+
+type ClickRandGiftReq struct {
+	//Uuid int `json:"uuid"`
+}
+type ClickRandGiftResp struct {
+	Code     int    `json:"code"`
+	Message  string `json:"message"`
+	Gold     int64  `json:"gold"`
+	Lefttime int    `json:"lefttime"`
+}
+
+type DoBuyCatReq struct {
+	Lv int `json:"lv"`
+}
+type DoBuyCatResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Pos     int    `json:"pos"`
+}
+
+type QueryWareHouseResp struct {
+	Code    int        `json:"code"`
+	Message string     `json:"message"`
+	Data    []DataDesc `json:"data"`
+}
+
+type QueryAutomergeResp struct {
+	Code         int        `json:"code"`
+	Message      string     `json:"message"`
+	Goldrate     int64      `json:"goldrate"`
+	Higestlv     int        `json:"higestlv"`
+	Curcatjianum int        `json:"curcatjianum"`
+	Data         []DataDesc `json:"data"`
+}
+
+type PutWareHouseReq struct {
+	Pos int `json:"pos"`
+}
+type PutWareHouseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Warepos int    `json:"warepos"`
+}
+
+type TakeWareHouseReq struct {
+	Warepos int `json:"warepos"`
+}
+type TakeWareHouseResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Pos     int    `json:"pos"`
+}
+
+type CatRoomDesc struct {
+	Pos   int `json:"pos"`
+	Catlv int `json:"cat_lv"`
+}
+
+type QueryCatRoomInfoResp struct {
+	Code    int           `json:"code"`
+	Message string        `json:"message"`
+	Data    []CatRoomDesc `json:"data"`
+}
+
+type BuyCatRoomReq struct {
+	Lv int `json:"lv"`
+}
+
+type BuyCatRoomResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type UpCattoRoomReq struct {
+	Roompos int `json:"roompos"`
+	Callv   int `json:"callv"`
+	Optype  int `json:"optype"`
+}
+
+type UpCattoRoommResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type QueryCatShopInfoResp struct {
+	Code        int    `json:"code"`
+	Message     string `json:"message"`
+	Chapter     int    `json:"chapter"`
+	Section     int    `json:"section"`
+	Lefttime    int    `json:"lefttime"`
+	Canwatch    int    `json:"canwatch"`
+	Storyhappen int    `json:"storyhappen"`
+}
+
+type CatShoPlayReq struct {
+	Catlv int `json:"catlv"`
+}
+type CatShoPlayResp struct {
+	Code     int    `json:"code"`
+	Message  string `json:"message"`
+	Lefttime int    `json:"lefttime"`
+	Canwatch int    `json:"canwatch"`
+}
+
+type GetCatShopRewardReq struct {
+	Optype int `json:"optype"`
+}
+
+type GetCatShopRewardResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Love    int64  `json:"love"`
+}
+
+type AcclecteCatStoryResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type UpdateUserInfoReq struct {
+	Headurl  string `json:"headurl"`
+	Nickname string `json:"nickname"`
+	Realname string `json:"realname"`
+}
+
+type UpdateUserInfoResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type RankInfoDesc struct {
+	Rank     int    `json:"rank"`
+	Headurl  string `json:"headurl"`
+	Nickname string `json:"nickname"`
+	Catlv    int    `json:"catlv"`
+	Goldnum  int64  `json:"goldnum"`
+}
+
+type QueryPlayerRankResp struct {
+	Code    int            `json:"code"`
+	Message string         `json:"message"`
+	Data    []RankInfoDesc `json:"data"`
+}
+
+type QueryCompleteTaskDesc struct {
+	Taskid int `json:"taskid"`
+}
+
+type QueryOnlienTaskDesc struct {
+	Taskid   int   `json:"taskid"`
+	Lefttime int64 `json:"lefttime"`
+}
+
+type QueryCompleteTaskResp struct {
+	Code    int                     `json:"code"`
+	Message string                  `json:"message"`
+	Data    []QueryCompleteTaskDesc `json:"data"`
+	Online  []QueryOnlienTaskDesc   `json:"online"`
+}
+
+type QueryCompleteAchievementDesc struct {
+	Achieveid int `json:"achieveid"`
+}
+
+type QueryCompleteAchievementResp struct {
+	Code    int                            `json:"code"`
+	Message string                         `json:"message"`
+	Data    []QueryCompleteAchievementDesc `json:"data"`
+}
+
+type GetTaskRewardReq struct {
+	Taskid int `json:"taskid"`
+}
+
+type GetTaskRewardResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type GetAchieveRewardReq struct {
+	Achieveid int `json:"achieveid"`
+}
+
+type GetAchieveRewardResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+}
+
+type StartOnlineTaskReq struct {
+	Taskid int `json:"taskid"`
+}
+
+type StartOnlineTaskResp struct {
+	Code     int    `json:"code"`
+	Message  string `json:"message"`
+	Lefttime int    `json:"lefttime"`
+}
+
+type GetOfflineRewardReq struct {
+	Optype int `json:"optype"`
+}
+
+type GetOfflineRewardResp struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Gold    int64  `json:"gold"`
+	Love    int64  `json:"love"`
+}
+
+//**********************************************************************************************************
+
+type PosData struct {
+	Pos       int
+	Catlv     int
+	Countdown int //倒计时 为0表示没有
+	//UpPos     int //上阵的位置 0表示未上阵
+}
+
+//玩家购买猫详情
+type BuyCatInfoData struct {
+	Buytime      int   //购买次数
+	IsMaxBuytime int   //是否达到涨价上线 1是0否
+	CurPrice     int64 //当前价格
+}
+
+//猫咖店家具数据
+type CatRoomData struct {
+	LvCatlv int //入住猫的等级
+}
+
+//猫咖门店数据
+type CatShopData struct {
+	Chapter           int //当前所处进度 对应shopcaofig的id
+	Section           int //当前小节进度 ，即当前大章节第几次故事
+	IsPlaying         int //是否处于探险模式 1是0否
+	LeftTime          int //探险剩余时间
+	PlayTimes         int //当前为第几次探险
+	DayNum            int //当天日期，用于判断跨天
+	TotalWatchNumLeft int //当天剩余看视频次数
+	ThisIsWatch       int //本次探险是否已经看过视频
+	IsMax             int //是否已经通关 1是0否
+	CurCatLv          int //参加探险的猫等级
+	IsStoryHappen     int //此次是否触发故事
+}
+
+//玩家排行榜数据
+type UserRankInfo struct {
+	Gold      int64  //金币
+	Head      string //头像地址
+	NickName  string //昵称
+	Highestlv int    //当前最高猫等级
+	Uuid      int    //uuid
+}
+
+//玩家任务数据 每日清零
+type TaskData struct {
+	//StartOnline  int         //开始计算在线时间
+	StartOnline  map[int]int64 //记录对应takid 和开始计时的时间
+	BuyCatTime   int           //商店购买猫次数
+	MergeTime    int           //合成猫次数
+	PlayWithTime int           //陪玩次数
+	WatchAddTime int           //看广告次数
+	CompleteId   map[int]int   //已经完成的任务的id，对应task表的id value无用
+	HaveComplete map[int]int   //记录当日已完成的任务，已完成则不再完成
+}
+
+//玩家成就数据
+type AchieveMentData struct {
+	GetNewCatTime int         //累计解锁新猫次数
+	GetAllJia     int         //累计获得猫爬架次数
+	GetRoomJu     int         //累计解锁新家具次数
+	StoryTime     int         //累计解锁故事
+	ShopTime      int         //累计解锁店铺
+	CompleteId    map[int]int //已经完成的任务的id，对应achievement表id value为无用
+	HaveComplete  map[int]int //记录已完成成就已完成则不再触发
+}
+
+//玩家数据
+type UserData struct {
+	Gold            int64            //金币
+	Love            int64            //爱心值
+	Goldrate        int64            //金币生成速率
+	Loverate        int64            //爱心生产速率
+	Highestlv       int              //当前最高猫等级
+	InviteId        int              //邀请者uid
+	CurBoxLv        int              //当前猫箱子等级
+	IsDouble        int              //当前加速标签  1表示双倍收益 0表示正常
+	IsAuto          int              //当前是否自动合成
+	IsBoxAcc        int              //是否处于加速生成箱子状态
+	RandGiftNum     int              //当前剩余空投猫粮次数
+	RandGiftDay     int              //记录当前猫粮日期，当日期变化则重置RandGiftNum
+	RandGiftTime    int              //记录上一次空投猫粮时间
+	Redbag          int              //红包值 单位为分
+	Head            string           //头像地址
+	NickName        string           //昵称
+	RealName        string           //实名
+	IsFirstRedBgCat int              //是否合成过红包猫 0表示否1表示是
+	OfflineGold     int64            //离线金币
+	OfflineLove     int64            //离线爱心
+	CatShopInfo     CatShopData      //猫咖门店数据
+	Taskinfo        TaskData         //任务数据
+	AchieveMent     AchieveMentData  //成就数据
+	PosInfo         []PosData        //位置信息 从0开始
+	BuyCatInfo      []BuyCatInfoData //商店购买猫数据 第一个元素为1级猫 第二个为2级猫以此类推
+	CatRoomInfo     []CatRoomData    //猫咖店数据
+
+}
+
+//仓库数据详情
+type WareHouseDesc struct {
+	Warelv int //红包猫等级 对应表id
+}
+
+//玩家仓库数据
+type UserWareHouseData struct {
+	Info []WareHouseDesc //下标表示位置
+}
+
+const (
+	TASK_TYPE_ONLINE       = 1  //在线
+	TASK_TYPE_BUYCAT       = 2  //商店购买猫
+	TASK_TYPE_MERGE        = 3  //合成猫
+	TASK_TYPE_PLAYWITHCAT  = 4  //猫咪陪玩
+	TASK_TYPE_WATCHADD     = 5  //观看广告
+	ACH_TYPE_GETCAT        = 6  //累计解锁猫
+	ACH_TYPE_GETCATJIA     = 7  //累计获得猫爬架
+	ACH_TYPE_GETCATROOMJIA = 8  //累计解锁新家具
+	ACH_TYPE_GETSTORY      = 9  //累计解锁新故事
+	ACH_TYPE_GBESHOP       = 10 //累计用于新店铺
+)
@@ -0,0 +1,106 @@
+package logic
+
+import (
+	"HttpServer/conf"
+	"bytes"
+	"common/logger"
+	"encoding/json"
+	"strconv"
+
+	"io/ioutil"
+	//"log"
+	"net/http"
+)
+
+//定时处理倒计时
+func StartHttpTicker() {
+
+}
+
+func StartHttpServe() {
+	startServerHttpServe()
+}
+
+//just for test
+func Testsendhttp() {
+	var test UserLoginData
+	//test.Uuid = 100
+	test.Fromid = 200
+	test.Sharetype = 1
+
+	client := &http.Client{}
+
+	bys, err := json.Marshal(&test)
+	if err != nil {
+		logger.Error("testsendhttp failed=%v", err)
+		return
+	}
+	body := bytes.NewBuffer(bys)
+	url := "http://127.0.0.1:50056/cat/login"
+	reqest, err := http.NewRequest("POST", url, body)
+	if err != nil {
+		logger.Error("http.NewRequest failed")
+	}
+	reqest.Header.Add("Uuid", "101")
+	//发送
+	//res, err := http.Post(url, "application/json;charset=utf-8", body)
+	res, err := client.Do(reqest)
+	if err != nil {
+		logger.Error(" post failed to %v err:%v data:%v", url, err, string(bys))
+		return
+	}
+
+	result, _ := ioutil.ReadAll(res.Body)
+	res.Body.Close()
+
+	s := string(result)
+	var resp GetUserDataResp
+	resp.Code = 0
+	var rdata UserLoginResp
+	_ = json.Unmarshal([]byte(s), &rdata)
+	logger.Info("testsendhttp , body:%v", rdata)
+}
+
+func CheckErr(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+func startServerHttpServe() {
+	http.HandleFunc("/cat/login", UserLogin)                                    //登录
+
+
+	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
+	CheckErr(err)
+}
+
+
+
+func UserLogin(w http.ResponseWriter, r *http.Request) {
+	//logger.Info("%%%%%%%%%%%%%%%%path=%v", *r.URL)
+	//for k, v := range r.Header {
+	//	logger.Info("*********************key=%v,value=%v", k, v)
+	//}
+
+	//w.Header().Add("Access-Control-Allow-Headers", "")
+	//w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,X_Requested_With,Accept, Origin, Host, Connection, Accept-Encoding, Accept-Language,DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Pragma")
+
+	Uuid := 0
+	if len(r.Header) > 0 {
+		Uuid, _ = strconv.Atoi(r.Header.Get("Uuid"))
+	}
+
+	if Uuid == 0 {
+		return
+	}
+	result, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+
+	s := string(result)
+	logger.Info("UserLogin , body:%v,uuid=%v", s, Uuid)
+
+	//HandlerLogin(w, s, Uuid)
+}
+
+
@@ -0,0 +1 @@
+package logic
 \ No newline at end of file
@@ -0,0 +1,76 @@
+package main
+
+import (
+	"HttpServer/conf"
+
+	"HttpServer/logic"
+	"HttpServer/redishandler"
+	"common/logger"
+	"flag"
+	"os"
+	"runtime/pprof"
+	"time"
+)
+
+func InitLogger(file string, lvl int) {
+	logger.New(file, lvl, logger.Rotate{Size: logger.GB, Expired: time.Hour * 24 * 7, Interval: time.Hour * 24})
+}
+
+func main() {
+	//defer utils.PrintPanicStack()
+	filename := flag.String("conf_path", "./conf/world.xml", "config file path")
+	logpath := flag.String("logpath", "./log", "log file path")
+	cpuprofile := flag.String("cpuprofile", "", "write cpu profile to file")
+	secs := flag.Int("exitsecs", 0, "how many secs to exit, defaut 0 to never exit")
+	lvl := flag.Int("lvl", 6, "log level default -debug")
+	flag.Parse()
+	InitLogger(*logpath+"/world.log", *lvl)
+	logger.Info("config file path:%v", *filename)
+
+	if *cpuprofile != "" {
+		f, err := os.Create(*cpuprofile)
+		if err != nil {
+			logger.Info("open cpu profile error %v:", err)
+		} else {
+			pprof.StartCPUProfile(f)
+			defer pprof.StopCPUProfile()
+		}
+	}
+	var ch chan int = make(chan int)
+	go waitFor(ch, *secs)
+
+	err := conf.LoadConf(*filename)
+	if err != nil {
+		logger.Info("error load conf fail %v:", err)
+		return
+	}
+
+	
+
+	err = redishandler.Init()
+	if err != nil {
+		logger.Info("err init redis err=%v", err)
+		return
+	}
+
+	go logic.StartHttpServe()
+	go logic.StartHttpTicker()
+	time.Sleep(time.Duration(2) * time.Second)
+	logic.Testsendhttp()
+
+	select {
+	case _ = <-ch:
+		logger.Info("---I'm done----")
+		break
+	}
+}
+
+func waitFor(ch chan int, secs int) {
+	if secs <= 0 {
+		return
+	}
+	time.Sleep(time.Duration(secs) * time.Second)
+
+	logger.Info("-------------ready to exit--------------------")
+	ch <- 1
+}
@@ -0,0 +1,125 @@
+package redishandler
+
+import (
+	"HttpServer/conf"
+	"common/logger"
+	"common/redis"
+	"encoding/json"
+	"errors"
+	"strconv"
+)
+
+const USER_TOKEN_KEY = "login_token"
+
+var gRedis *redis.RedisClient = nil
+
+func GetRedisClient() *redis.RedisClient {
+	return gRedis
+}
+
+type TestInfo struct {
+	Gold      int64  //金币
+	Head      string //头像地址
+	NickName  string //昵称
+	Highestlv int    //当前最高猫等级
+	Uuid      int    //uuid
+}
+
+type Mytest struct {
+	Test1      int
+	M_userInfo map[int]int
+}
+
+func TestMyredis() {
+	//testmap
+	var test Mytest
+	test.Test1 = 1
+	test.M_userInfo = make(map[int]int)
+	test.M_userInfo[1] = 1
+	test.M_userInfo[1] = 2
+	test.M_userInfo[2] = 2
+	ddt, _ := json.Marshal(&test)
+	gRedis.SetString("testddt", string(ddt))
+	logger.Info("testddt test=%v.ddt=%v", test, string(ddt))
+
+	rest, err := gRedis.GetString("testddt")
+	if err != nil {
+		logger.Error("TestMyredis ddtfailed err=%v", err)
+	} else {
+		var restest Mytest
+		err = json.Unmarshal([]byte(rest), &restest)
+		logger.Info("testddt rest=%v,restest=%v", rest, restest)
+
+	}
+	//gRedis.HSet("luheng", "luhengsb", "22")
+	//gRedis.HSet("luheng", "luhengbb", "33")
+
+	var rinfo TestInfo
+	rinfo.Gold = 100
+	rinfo.Highestlv = 99
+	rinfo.Head = "sb"
+	rinfo.NickName = "sd"
+	rinfo.Uuid = 1004
+	rinfostr, _ := json.Marshal(&rinfo)
+	err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
+	if err != nil {
+		logger.Info("TestMyredis failed err=%v", err)
+	} else {
+		logger.Info("TestMyredis success rinfostr=%v", string(rinfostr))
+	}
+	rinfo.Gold = 1000
+	rinfo.Highestlv = 99
+	rinfo.Head = "sb1"
+	rinfo.NickName = "sd1"
+	rinfo.Uuid = 1005
+	rinfostr, _ = json.Marshal(&rinfo)
+	err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
+	rinfo.Gold = 10000
+	rinfo.Highestlv = 99
+	rinfo.Head = "sb2"
+	rinfo.NickName = "sd2"
+	rinfo.Uuid = 1006
+	rinfostr, _ = json.Marshal(&rinfo)
+	err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
+
+	vv, err := gRedis.ZRevRangewithIndex("luhengtest", 0, -1)
+	if err == nil {
+		for k, v := range vv {
+			rinfobyte, _ := v.([]byte)
+			var rinfo TestInfo
+			//logger.Info("TestMyredis ori=%v", string(v.([]byte)))
+			err := json.Unmarshal(rinfobyte, &rinfo)
+			if err == nil {
+				logger.Info("TestMyredis k=%v,v=%v", k, rinfo)
+			} else {
+				logger.Info("TestMyredis isbigsb err=%v", err)
+			}
+
+		}
+	} else {
+		logger.Info("test is err=%v", err)
+	}
+}
+
+func Init() error {
+	redis_cfg := conf.GetRedisConf()
+	if gRedis = redis.NewRedisClient(redis_cfg.Host, redis_cfg.Password, redis_cfg.Db); gRedis == nil {
+		return errors.New("initRedis error")
+	}
+
+	logger.Info("init redis success!")
+	TestMyredis()
+	return nil
+}
+
+/*
+	加载token
+*/
+func LoadPlayerTokenFromRedis(uid int) (string, error) {
+	token, err := gRedis.HGet(USER_TOKEN_KEY, strconv.Itoa(uid))
+	if err != nil {
+		logger.Notic("LoadPlayerTokenFromRedis failed uid:%v err%v", uid, err)
+		return "", err
+	}
+	return token, err
+}
@@ -0,0 +1,125 @@
+// Copyright 2014 beego Author. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// source code is here : https://github.com/astaxie/beego/blob/master/utils/safemap.go
+
+//package utils
+package beegomap
+
+import (
+	"sync"
+)
+
+// BeeMap is a map with lock
+type BeeMap struct {
+	lock *sync.RWMutex
+	Bm   map[uint32]interface{}
+}
+
+// NewBeeMap return new safemap
+func NewBeeMap() *BeeMap {
+	return &BeeMap{
+		lock: new(sync.RWMutex),
+		Bm:   make(map[uint32]interface{}),
+	}
+}
+
+// Get from maps return the k's value
+func (m *BeeMap) Get(k uint32) interface{} {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	if val, ok := m.Bm[k]; ok {
+		return val
+	}
+	return nil
+}
+
+// Set Maps the given key and value. Returns false
+// if the key is already in the map and changes nothing.
+func (m *BeeMap) Set(k uint32, v interface{}) bool {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	if val, ok := m.Bm[k]; !ok {
+		m.Bm[k] = v
+	} else if val != v {
+		m.Bm[k] = v
+	} else {
+		return false
+	}
+	return true
+}
+
+//force set
+func (m *BeeMap) Replace(k uint32, v interface{}) bool {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	delete(m.Bm, k)
+	if val, ok := m.Bm[k]; !ok {
+		m.Bm[k] = v
+	} else if val != v {
+		m.Bm[k] = v
+	} else {
+		return false
+	}
+	return true
+}
+
+// Check Returns true if k is exist in the map.
+func (m *BeeMap) Check(k uint32) bool {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	if _, ok := m.Bm[k]; !ok {
+		return false
+	}
+	return true
+}
+
+// Delete the given key and value.
+func (m *BeeMap) Delete(k uint32) {
+	m.lock.Lock()
+	defer m.lock.Unlock()
+	delete(m.Bm, k)
+}
+
+// Items returns all items in safemap.
+func (m *BeeMap) Items() map[uint32]interface{} {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	r := make(map[uint32]interface{})
+	for k, v := range m.Bm {
+		r[k] = v
+	}
+	return r
+}
+
+func (m *BeeMap) Len() uint32 {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	return uint32(len(m.Bm))
+}
+
+func (m *BeeMap) Clear() {
+	items := m.Items()
+	for k := range items {
+		m.Delete(k)
+	}
+}
+func (m *BeeMap) GetRandomKey() uint32 {
+	m.lock.RLock()
+	defer m.lock.RUnlock()
+	for k := range m.Items() {
+		return k
+	}
+	return 0
+}
@@ -0,0 +1,280 @@
+package logger
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"time"
+)
+
+type ByteSize float64
+
+const (
+	_           = iota
+	KB ByteSize = 1 << (10 * iota)
+	MB
+	GB
+	TB
+	PB
+	EB
+	ZB
+	YB
+)
+
+const (
+	checkSize    = 2 * time.Minute
+	checkExpired = 2 * time.Hour
+)
+
+var (
+	stdFatal = log.New(os.Stderr, "\033[0;33mFATAL:\033[0m ", log.LstdFlags|log.Lshortfile)
+	stdError = log.New(os.Stderr, "\033[0;31mERROR:\033[0m ", log.LstdFlags|log.Lshortfile)
+	stdWarn  = log.New(os.Stderr, "\033[0;35mWARN:\033[0m ", log.LstdFlags|log.Lshortfile)
+	ll       *Logger
+)
+
+type Logger struct {
+	errCount int32
+	rotate   Rotate
+	level    chan int
+
+	rwm                                  sync.RWMutex
+	file                                 *os.File
+	debug, info, notic, warn, err, fatal *log.Logger
+}
+
+type Rotate struct {
+	Size              ByteSize
+	Expired, Interval time.Duration
+}
+
+func New(fp string, lvl int, rotate Rotate) *Logger {
+	f, err := os.OpenFile(fp, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		stdFatal.Fatalln(err.Error())
+	}
+	ll = new(Logger)
+	ll.rotate = rotate
+	ll.file = f
+	ll.level = make(chan int)
+	go ll.loop()
+	ll.SetLevel(lvl)
+	return ll
+}
+
+func (l *Logger) SetLevel(lvl int) {
+	l.level <- lvl
+}
+
+func (l *Logger) setLevel(f *os.File, lvl int) {
+	switch {
+	case lvl > 5:
+		l.debug = log.New(f, "\033[0;36mDEBUG:\033[0m ", log.LstdFlags|log.Lshortfile)
+		fallthrough
+	case lvl > 4:
+		l.info = log.New(f, "INFO: ", log.LstdFlags|log.Lshortfile)
+		fallthrough
+	case lvl > 3:
+		l.notic = log.New(f, "\033[0;32mNOTIC:\033[0m ", log.LstdFlags|log.Lshortfile)
+		fallthrough
+	case lvl > 2:
+		l.warn = log.New(f, "\033[0;35mWARN:\033[0m ", log.LstdFlags|log.Lshortfile)
+		fallthrough
+	case lvl > 1:
+		l.err = log.New(f, "\033[0;31mERROR:\033[0m ", log.LstdFlags|log.Lshortfile)
+		fallthrough
+	case lvl > 0:
+		l.fatal = log.New(f, "\033[0;33mFATAL:\033[0m ", log.LstdFlags|log.Lshortfile)
+	}
+	switch {
+	case lvl < 1:
+		l.fatal = nil
+		fallthrough
+	case lvl < 2:
+		l.err = nil
+		fallthrough
+	case lvl < 3:
+		l.warn = nil
+		fallthrough
+	case lvl < 4:
+		l.notic = nil
+		fallthrough
+	case lvl < 5:
+		l.info = nil
+		fallthrough
+	case lvl < 6:
+		l.debug = nil
+	}
+}
+
+func (l *Logger) getFileSize() ByteSize {
+	l.rwm.RLock()
+	defer l.rwm.RUnlock()
+	fi, err := l.file.Stat()
+	if err != nil {
+		Warn("get log file size failed, no trunc %s", err.Error())
+		return 0.0
+	}
+	return ByteSize(fi.Size())
+}
+
+func (l *Logger) trunc(fp, ext string, lvl int) {
+	l.rwm.Lock()
+	defer l.rwm.Unlock()
+	err := l.file.Close()
+	if err != nil {
+		stdWarn.Println("fail to close log file", err.Error())
+		return
+	}
+	err = os.Rename(fp, fp+ext)
+	if err != nil {
+		stdWarn.Println("fail to rename log file, no trunc", err.Error())
+	}
+	f, err := os.OpenFile(fp, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	if err != nil {
+		Error("create log file failed %s", err.Error())
+		return
+	}
+	l.setLevel(f, lvl)
+	l.file = f
+}
+
+func suffix(t time.Time) string {
+	y, m, d := t.Date()
+	return "-" + fmt.Sprintf("%04d%02d%02d%02d", y, m, d, t.Hour())
+}
+
+func toNextBound(d time.Duration) time.Duration {
+	return time.Now().Truncate(d).Add(d).Sub(time.Now())
+}
+
+func (l *Logger) loop() error {
+	interval := time.After(toNextBound(l.rotate.Interval))
+	expired := time.After(checkExpired)
+	var sizeExt, lvl int = 1, 4
+	fp, err := filepath.Abs(l.file.Name())
+	if err != nil {
+		stdFatal.Fatalln("get log filepath failed %s", err.Error())
+	}
+	for {
+		var size <-chan time.Time
+		if toNextBound(l.rotate.Interval) != checkSize {
+			size = time.After(checkSize)
+		}
+		select {
+		case lvl = <-l.level:
+			l.rwm.Lock()
+			l.setLevel(l.file, lvl)
+			l.rwm.Unlock()
+			Notic("log level change to %d", lvl)
+		case t := <-interval:
+			interval = time.After(l.rotate.Interval)
+			l.trunc(fp, suffix(t), lvl)
+			sizeExt = 1
+			Notic("log truncated by time interval")
+		case <-expired:
+			expired = time.After(checkExpired)
+			err := filepath.Walk(filepath.Dir(fp),
+				func(path string, info os.FileInfo, err error) error {
+					if err != nil {
+						return nil
+					}
+					isLog := strings.Contains(info.Name(), ".log")
+
+					//log.Println("strings.Contains(", info.Name(), " log') isLog = ", isLog)
+					if time.Since(info.ModTime()) > l.rotate.Expired && isLog && info.IsDir() == false {
+						if err := os.Remove(path); err != nil {
+							return err
+						}
+						Notic("remove expired log files %s", filepath.Base(path))
+					}
+					return nil
+				})
+			if err != nil {
+				Warn("remove expired logs failed %s", err.Error())
+			}
+		case t := <-size:
+			if l.getFileSize() < l.rotate.Size {
+				break
+			}
+			l.trunc(fp, suffix(t)+"."+strconv.Itoa(sizeExt), lvl)
+			sizeExt++
+			Notic("log over size, truncated")
+		}
+	}
+}
+
+// Debug log debug message with cyan color.
+func Debug(format string, v ...interface{}) {
+	ll.rwm.RLock()
+	if ll.debug != nil {
+		ll.debug.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+}
+
+// Info log normal message.
+func Info(format string, v ...interface{}) {
+	ll.rwm.RLock()
+	if ll.info != nil {
+		ll.info.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+}
+
+// Notice log notice message with blue color.
+func Notic(format string, v ...interface{}) {
+	ll.rwm.RLock()
+	if ll.notic != nil {
+		ll.notic.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+}
+
+// Error log error message with red color.
+func Error(format string, v ...interface{}) {
+	atomic.AddInt32(&ll.errCount, 1)
+	stdError.Output(2, fmt.Sprintf(format, v...))
+	ll.rwm.RLock()
+	if ll.err != nil {
+		ll.err.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+}
+
+func ErrCount() int32 {
+	ec := atomic.LoadInt32(&ll.errCount)
+	if ec < 0 {
+		Warn("error count overflow")
+		return -1
+	}
+	return ec
+}
+
+func Fatal(format string, v ...interface{}) {
+	stdFatal.Output(2, fmt.Sprintf(format, v...))
+	ll.rwm.RLock()
+	if ll.fatal != nil {
+		ll.fatal.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+	os.Exit(1)
+}
+
+func Warn(format string, v ...interface{}) {
+	stdWarn.Output(2, fmt.Sprintf(format, v...))
+	ll.rwm.RLock()
+	if ll.warn != nil {
+		ll.warn.Output(2, fmt.Sprintf(format, v...))
+	}
+	ll.rwm.RUnlock()
+}
+
+func GetLogger() *Logger {
+	return ll
+}
@@ -0,0 +1,13 @@
+package redis
+
+const (
+	USER_LAST_LOGIN_TIME   = "CATSERVER_USER_LAST_LOGIN_TIME"   //玩家上次登陆时间
+	USER_INFO              = "CATSERVER_USER_USER_INFO"         //玩家数据
+	USER_LAST_CALC_TIME    = "CATSERVER_USER_LAST_CALC_TIME"    //玩家上一次数据计算时间
+	USER_INVITE_ID         = "CATSERVER_USER_INVITE_ID"         //玩家邀请者ID
+	USER_STARTDOUBLE_TIME  = "CATSERVER_USER_STARTDOUBLE_TIME"  //开启双倍时间
+	USER_STARTAUTO_TIME    = "CATSERVER_USER_STARTAUTO_TIME"    //开启自动合成时间
+	USER_STARTACC_BOX_TIME = "CATSERVER_USER_STARTACC_BOX_TIME" //开启加速成产箱子
+	USER_WAREHOUSE_INFO    = "CATSERVER_USER_WAREHOUSE_INFO"    //玩家仓库信息
+	USER_GOLD_RANK         = "CATSERVER_USER_GOLD_RANK"         //玩家排行榜，根据金币排
+)
@@ -0,0 +1,212 @@
+package redis
+
+import (
+	"sync"
+
+	"github.com/garyburd/redigo/redis"
+	//"math/rand"
+	"errors"
+	//"sync"
+	"fmt"
+	"time"
+)
+
+type subCallBack interface {
+	OnMessage(channnel string, msg []byte)
+	OnPMessage(pattern string, channel string, msg []byte)
+	OnSubscription(kind string, channel string, count int)
+	OnError(err error)
+}
+
+type PubSubClient struct {
+	m_host        string
+	db_index      uint32
+	password      string
+	m_pool        *redis.Pool
+	m_conn        redis.PubSubConn
+	m_lock        sync.Mutex
+	m_subCallback subCallBack
+	m_subList     map[string]bool
+	m_psubList    map[string]bool
+}
+
+func NewPubSubClient(host string, password string, db uint32) *PubSubClient {
+	client := new(PubSubClient)
+	client.m_host = host
+	client.db_index = db
+	client.password = password
+	client.m_subList = make(map[string]bool)
+	client.m_psubList = make(map[string]bool)
+	client.m_pool = &redis.Pool{
+		MaxIdle: 64,
+		//MaxActive:   1,
+		IdleTimeout: 60 * time.Second,
+		TestOnBorrow: func(c redis.Conn, t time.Time) error {
+			_, err := c.Do("PING")
+
+			return err
+		},
+		Dial: func() (redis.Conn, error) {
+			c, err := redis.Dial("tcp", host, redis.DialDatabase(int(db)), redis.DialPassword(password))
+			if err != nil {
+				return nil, err
+			}
+			return c, err
+		},
+	}
+
+	conn, err := redis.Dial("tcp", host, redis.DialDatabase(int(db)), redis.DialPassword(password))
+	if err != nil {
+		fmt.Printf("error dial:%v", err)
+		return nil
+	}
+	client.m_conn = redis.PubSubConn{Conn: conn}
+	return client
+}
+
+func (client *PubSubClient) Publish(channel, value interface{}) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("PUBLISH", channel, value); err != nil {
+		return err
+	}
+	return nil
+
+}
+
+func (client *PubSubClient) Subscribe(channel string) error {
+	client.m_lock.Lock()
+	defer client.m_lock.Unlock()
+	if err := client.m_conn.Subscribe(channel); err != nil {
+		return err
+	}
+	client.m_subList[channel] = true
+	return nil
+}
+
+func (client *PubSubClient) Unsubscribe(channel string) error {
+	//logger.DEBUG("Unsubscribe, channName:%s\n", channel)
+	client.m_lock.Lock()
+	defer client.m_lock.Unlock()
+	if channel == "" {
+		if err := client.m_conn.Unsubscribe(); err != nil {
+			return err
+		}
+		// clear all element in this map
+		for k := range client.m_subList {
+			delete(client.m_subList, k)
+		}
+	} else {
+		if err := client.m_conn.Unsubscribe(channel); err != nil {
+			return err
+		}
+		delete(client.m_subList, channel)
+	}
+	return nil
+}
+
+func (client *PubSubClient) PSubscribe(channel string) error {
+	client.m_lock.Lock()
+	defer client.m_lock.Unlock()
+	if err := client.m_conn.PSubscribe(channel); err != nil {
+		return err
+	}
+	client.m_psubList[channel] = true
+	return nil
+}
+
+func (client *PubSubClient) PUnsubscribe(channel string) error {
+	client.m_lock.Lock()
+	defer client.m_lock.Unlock()
+	if channel == "" {
+		if err := client.m_conn.PUnsubscribe(); err != nil {
+			return err
+		}
+		// clear all element in this map
+		for k := range client.m_subList {
+			delete(client.m_psubList, k)
+		}
+	} else {
+		if err := client.m_conn.PUnsubscribe(channel); err != nil {
+			return err
+		}
+		delete(client.m_subList, channel)
+	}
+	return nil
+}
+
+func (client *PubSubClient) SetSubCallback(cb subCallBack) {
+	client.m_subCallback = cb
+}
+
+func (client *PubSubClient) reConnect() {
+
+	//1. first close old connection
+	client.m_conn.Close()
+
+	//2. create a new connection
+	for {
+		//		conn, err := redis.Dial("tcp", client.m_host)
+		conn, err := redis.Dial("tcp", client.m_host, redis.DialDatabase(int(client.db_index)), redis.DialPassword(client.password))
+		if err == nil {
+			client.m_conn = redis.PubSubConn{Conn: conn}
+			return
+		}
+		time.Sleep(time.Second)
+		//logger.DEBUG("reConnecting\n")
+	}
+}
+
+func (client *PubSubClient) reSubscribe() {
+	for key := range client.m_subList {
+		client.Subscribe(key)
+	}
+	for key := range client.m_psubList {
+		client.PSubscribe(key)
+	}
+}
+
+func (client *PubSubClient) StartSubscribe(cb subCallBack) error {
+	if cb == nil {
+		return errors.New("subCallback is not set!")
+	}
+	client.m_subCallback = cb
+	go func() {
+		//exit_loop:
+		for {
+			switch n := client.m_conn.Receive().(type) {
+			case redis.Message:
+				//logger.DEBUG("Message: chann[%s] data[%s]\n", n.Channel, n.Data)
+				if client.m_subCallback.OnMessage != nil {
+					client.m_subCallback.OnMessage(n.Channel, n.Data)
+				}
+			case redis.PMessage:
+				//logger.DEBUG("PMessage: pattern[%s] chann[%s] data[%s]\n", n.Pattern, n.Channel, n.Data)
+				if client.m_subCallback.OnPMessage != nil {
+					client.m_subCallback.OnPMessage(n.Pattern, n.Channel, n.Data)
+				}
+			case redis.Subscription:
+				//logger.DEBUG("Subscription: %s %s %d\n", n.Kind, n.Channel, n.Count)
+				if client.m_subCallback.OnSubscription != nil {
+					client.m_subCallback.OnSubscription(n.Kind, n.Channel, n.Count)
+				}
+				if n.Count == 0 {
+					//logger.DEBUG("exit ddd: \n")
+					//break exit_loop
+				}
+			case error:
+				if client.m_subCallback.OnError != nil {
+					client.m_subCallback.OnError(n)
+				}
+				//logger.DEBUG("error: %v\n", n)
+				client.reConnect()
+				client.reSubscribe()
+				//client.m_conn = redis.PubSubConn{Conn: m_psPool.Get()}
+				//break exit_loop
+			}
+		}
+		//logger.DEBUG("exit: \n")
+	}()
+
+	return nil
+}
@@ -0,0 +1,408 @@
+package redis
+
+import (
+	"fmt"
+
+	"github.com/garyburd/redigo/redis"
+	//"math/rand"
+
+	"strconv"
+	//"sync"
+	"errors"
+	"time"
+)
+
+type RedisClient struct {
+	m_pool *redis.Pool
+}
+
+func NewRedisClient(host string, password string, db_index uint32) *RedisClient {
+	client := new(RedisClient)
+	client.m_pool = &redis.Pool{
+		MaxIdle:     64,
+		IdleTimeout: 60 * time.Second,
+		TestOnBorrow: func(c redis.Conn, t time.Time) error {
+			_, err := c.Do("PING")
+
+			return err
+		},
+		Dial: func() (redis.Conn, error) {
+			c, err := redis.Dial("tcp", host)
+			if err != nil {
+				return nil, err
+			}
+			if password != "" {
+				if _, err := c.Do("AUTH", password); err != nil {
+					c.Close()
+					return nil, err
+				}
+			}
+			_, err = c.Do("SELECT", db_index)
+			if err != nil {
+				return nil, err
+			}
+
+			return c, err
+		},
+	}
+	return client
+}
+
+// 写入值永不过期
+func (client *RedisClient) SetString(key, value string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	_, err := conn.Do("SET", key, value)
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) SetBytes(key string, bys []byte) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	_, err := conn.Do("SET", key, bys)
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) SetExString(key, value string, expireTime int /* seconds*/) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	expStr := strconv.Itoa(expireTime)
+	_, err := conn.Do("SETEX", key, expStr, value)
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) Delete(key string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	_, err := conn.Do("DEL", key)
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) Expire(key string, expireTime int /* seconds*/) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	expStr := strconv.Itoa(expireTime)
+	_, err := conn.Do("EXPIRE", key, expStr)
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) GetKeys(pattern string) ([]string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Strings(conn.Do("keys", pattern))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) GetString(key string) (string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.String(conn.Do("GET", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+func (client *RedisClient) GetBytes(key string) ([]byte, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := conn.Do("GET", key)
+	if err != nil {
+		fmt.Println("redis get failed:", err)
+	}
+	return value.([]byte), err
+}
+
+func (client *RedisClient) GetInt64(key string) (int64, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Int64(conn.Do("GET", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) GetUint64(key string) (uint64, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Uint64(conn.Do("GET", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) GetInt(key string) (int, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Int(conn.Do("GET", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) GetBool(key string) (bool, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Bool(conn.Do("GET", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) HExists(key string, field string) (bool, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Bool(conn.Do("HEXISTS", key, field))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) Exists(key string) (bool, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Bool(conn.Do("EXISTS", key))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) HMSet(key string, data interface{}) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("HMSET", redis.Args{}.Add(key).AddFlat(data)...); err != nil {
+		//fmt.Println("redis set failed:", err)
+		return err
+	}
+
+	return nil
+}
+
+func (client *RedisClient) HSet(key, field, value string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("HSET", key, field, value); err != nil {
+		//fmt.Println("redis set failed:", err)
+		return err
+	}
+
+	return nil
+}
+
+func (client *RedisClient) Zadd(key string, score float64, member string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("ZADD", key, score, member); err != nil {
+		//fmt.Println("redis set failed:", err)
+		return err
+	}
+
+	return nil
+}
+
+func (client *RedisClient) ZRevRangewithIndex(key string, start, end int) ([]interface{}, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	v, err := redis.Values(conn.Do("ZREVRANGE", key, start, end))
+	return v, err
+}
+
+func (client *RedisClient) HSetBytes(key, field string, value []byte) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("HSET", key, field, value); err != nil {
+		//fmt.Println("redis set failed:", err)
+		return err
+	}
+
+	return nil
+}
+
+func (client *RedisClient) HDel(key, field string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	if _, err := conn.Do("HDEL", key, field); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (client *RedisClient) HGetAll(key string, data interface{}) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	v, err := redis.Values(conn.Do("HGETALL", key))
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+		return err
+	}
+	if err := redis.ScanStruct(v, data); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (client *RedisClient) HGetAllValues(key string) ([]interface{}, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	v, err := redis.Values(conn.Do("HGETALL", key))
+	return v, err
+}
+
+func (client *RedisClient) HGetAllKeys(key string) ([]interface{}, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	v, err := redis.Values(conn.Do("hkeys", key))
+	return v, err
+}
+
+func (client *RedisClient) HGet(key string, field string) (string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.String(conn.Do("HGET", key, field))
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+		return "", err
+	}
+	return value, nil
+}
+func (client *RedisClient) HGetBytes(key, field string) ([]byte, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := conn.Do("HGET", key, field)
+	if err != nil {
+		fmt.Println("redis hget failed:", err)
+		return []byte{}, err
+	}
+	if value == nil {
+		return []byte{}, errors.New("value nil")
+	}
+	return value.([]byte), err
+}
+
+func (client *RedisClient) HGetInt(key string, field string) (int, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Int(conn.Do("HGET", key, field))
+	if err != nil {
+		//fmt.Println("redis set failed:", err)
+		return 0, err
+	}
+	return value, nil
+}
+
+func (client *RedisClient) LPop(listName string) (string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.String(conn.Do("LPOP", listName))
+	if err != nil {
+		//fmt.Println("LPop redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) LRem(listName string, count int, value string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	cntStr := strconv.Itoa(count)
+	_, err := redis.Int(conn.Do("LREM", listName, cntStr, value))
+	if err != nil {
+		//fmt.Println("LPop redis get failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) RPush(listName string, element string) error {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	_, err := redis.Int(conn.Do("RPUSH", listName, element))
+	if err != nil {
+		//fmt.Println("RPush redis get failed:", err)
+	}
+	return err
+}
+
+func (client *RedisClient) LLen(listName string) (int, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Int(conn.Do("LLEN", listName))
+	if err != nil {
+		//fmt.Println("LLEN redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) LIndex(listName string, index int) (string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	idxStr := strconv.Itoa(index)
+	value, err := redis.String(conn.Do("LINDEX", listName, idxStr))
+	if err != nil {
+		//fmt.Println("LIndex redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) LRange(listName string, start int, stop int) ([]string, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Strings(conn.Do("LRANGE", listName, start, stop))
+	if err != nil {
+		//fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) Incr(key string) (uint64, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Uint64(conn.Do("INCR", key))
+	if err != nil {
+		//fmt.Println("RPush redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) IncrBy(key string, incr int) (uint64, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	value, err := redis.Uint64(conn.Do("INCRBY", key, incr))
+	if err != nil {
+		fmt.Println("redis get failed:", err)
+	}
+	return value, err
+}
+
+func (client *RedisClient) HMGets(key string) ([]interface{}, error) {
+	conn := client.m_pool.Get()
+	defer conn.Close()
+	v, err := redis.Values(conn.Do("HGETALL", key))
+	if err != nil {
+		fmt.Println("redis get failed:", err)
+		return nil, err
+	}
+	return v, err
+}
@@ -0,0 +1,5 @@
+Ask questions at
+[StackOverflow](https://stackoverflow.com/questions/ask?tags=go+redis).
+
+[Open an issue](https://github.com/garyburd/redigo/issues/new) to discuss your
+plans before doing any work on Redigo.
@@ -0,0 +1 @@
+Ask questions at https://stackoverflow.com/questions/ask?tags=go+redis
@@ -0,0 +1,19 @@
+language: go
+sudo: false
+services:
+  - redis-server
+
+go:
+  - 1.4
+  - 1.5
+  - 1.6
+  - 1.7
+  - 1.8
+  - 1.9
+  - tip
+
+script:
+  - go get -t -v ./...
+  - diff -u <(echo -n) <(gofmt -d .)
+  - go vet $(go list ./... | grep -v /vendor/)
+  - go test -v -race ./...
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
@@ -0,0 +1,51 @@
+Redigo
+======
+
+[![Build Status](https://travis-ci.org/garyburd/redigo.svg?branch=master)](https://travis-ci.org/garyburd/redigo)
+[![GoDoc](https://godoc.org/github.com/garyburd/redigo/redis?status.svg)](https://godoc.org/github.com/garyburd/redigo/redis)
+
+Redigo is a [Go](http://golang.org/) client for the [Redis](http://redis.io/) database.
+
+Features
+-------
+
+* A [Print-like](http://godoc.org/github.com/garyburd/redigo/redis#hdr-Executing_Commands) API with support for all Redis commands.
+* [Pipelining](http://godoc.org/github.com/garyburd/redigo/redis#hdr-Pipelining), including pipelined transactions.
+* [Publish/Subscribe](http://godoc.org/github.com/garyburd/redigo/redis#hdr-Publish_and_Subscribe).
+* [Connection pooling](http://godoc.org/github.com/garyburd/redigo/redis#Pool).
+* [Script helper type](http://godoc.org/github.com/garyburd/redigo/redis#Script) with optimistic use of EVALSHA.
+* [Helper functions](http://godoc.org/github.com/garyburd/redigo/redis#hdr-Reply_Helpers) for working with command replies.
+
+Documentation
+-------------
+
+- [API Reference](http://godoc.org/github.com/garyburd/redigo/redis)
+- [FAQ](https://github.com/garyburd/redigo/wiki/FAQ)
+- [Examples](https://godoc.org/github.com/garyburd/redigo/redis#pkg-examples)
+
+Installation
+------------
+
+Install Redigo using the "go get" command:
+
+    go get github.com/garyburd/redigo/redis
+
+The Go distribution is Redigo's only dependency.
+
+Related Projects
+----------------
+
+- [rafaeljusto/redigomock](https://godoc.org/github.com/rafaeljusto/redigomock) - A mock library for Redigo.
+- [chasex/redis-go-cluster](https://github.com/chasex/redis-go-cluster) - A Redis cluster client implementation.
+- [FZambia/go-sentinel](https://github.com/FZambia/go-sentinel) - Redis Sentinel support for Redigo
+- [PuerkitoBio/redisc](https://github.com/PuerkitoBio/redisc) - Redis Cluster client built on top of Redigo
+
+Contributing
+------------
+
+See [CONTRIBUTING.md](https://github.com/garyburd/redigo/blob/master/.github/CONTRIBUTING.md).
+
+License
+-------
+
+Redigo is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
@@ -0,0 +1,54 @@
+// Copyright 2014 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package internal // import "github.com/garyburd/redigo/internal"
+
+import (
+	"strings"
+)
+
+const (
+	WatchState = 1 << iota
+	MultiState
+	SubscribeState
+	MonitorState
+)
+
+type CommandInfo struct {
+	Set, Clear int
+}
+
+var commandInfos = map[string]CommandInfo{
+	"WATCH":      {Set: WatchState},
+	"UNWATCH":    {Clear: WatchState},
+	"MULTI":      {Set: MultiState},
+	"EXEC":       {Clear: WatchState | MultiState},
+	"DISCARD":    {Clear: WatchState | MultiState},
+	"PSUBSCRIBE": {Set: SubscribeState},
+	"SUBSCRIBE":  {Set: SubscribeState},
+	"MONITOR":    {Set: MonitorState},
+}
+
+func init() {
+	for n, ci := range commandInfos {
+		commandInfos[strings.ToLower(n)] = ci
+	}
+}
+
+func LookupCommandInfo(commandName string) CommandInfo {
+	if ci, ok := commandInfos[commandName]; ok {
+		return ci
+	}
+	return commandInfos[strings.ToUpper(commandName)]
+}
@@ -0,0 +1,27 @@
+package internal
+
+import "testing"
+
+func TestLookupCommandInfo(t *testing.T) {
+	for _, n := range []string{"watch", "WATCH", "wAtch"} {
+		if LookupCommandInfo(n) == (CommandInfo{}) {
+			t.Errorf("LookupCommandInfo(%q) = CommandInfo{}, expected non-zero value", n)
+		}
+	}
+}
+
+func benchmarkLookupCommandInfo(b *testing.B, names ...string) {
+	for i := 0; i < b.N; i++ {
+		for _, c := range names {
+			LookupCommandInfo(c)
+		}
+	}
+}
+
+func BenchmarkLookupCommandInfoCorrectCase(b *testing.B) {
+	benchmarkLookupCommandInfo(b, "watch", "WATCH", "monitor", "MONITOR")
+}
+
+func BenchmarkLookupCommandInfoMixedCase(b *testing.B) {
+	benchmarkLookupCommandInfo(b, "wAtch", "WeTCH", "monItor", "MONiTOR")
+}
@@ -0,0 +1,68 @@
+// Copyright 2014 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package redistest contains utilities for writing Redigo tests.
+package redistest
+
+import (
+	"errors"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+type testConn struct {
+	redis.Conn
+}
+
+func (t testConn) Close() error {
+	_, err := t.Conn.Do("SELECT", "9")
+	if err != nil {
+		return nil
+	}
+	_, err = t.Conn.Do("FLUSHDB")
+	if err != nil {
+		return err
+	}
+	return t.Conn.Close()
+}
+
+// Dial dials the local Redis server and selects database 9. To prevent
+// stomping on real data, DialTestDB fails if database 9 contains data. The
+// returned connection flushes database 9 on close.
+func Dial() (redis.Conn, error) {
+	c, err := redis.DialTimeout("tcp", ":6379", 0, 1*time.Second, 1*time.Second)
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = c.Do("SELECT", "9")
+	if err != nil {
+		c.Close()
+		return nil, err
+	}
+
+	n, err := redis.Int(c.Do("DBSIZE"))
+	if err != nil {
+		c.Close()
+		return nil, err
+	}
+
+	if n != 0 {
+		c.Close()
+		return nil, errors.New("database #9 is not empty, test can not continue")
+	}
+
+	return testConn{c}, nil
+}
@@ -0,0 +1,651 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bufio"
+	"bytes"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"net/url"
+	"regexp"
+	"strconv"
+	"sync"
+	"time"
+)
+
+// conn is the low-level implementation of Conn
+type conn struct {
+	// Shared
+	mu      sync.Mutex
+	pending int
+	err     error
+	conn    net.Conn
+
+	// Read
+	readTimeout time.Duration
+	br          *bufio.Reader
+
+	// Write
+	writeTimeout time.Duration
+	bw           *bufio.Writer
+
+	// Scratch space for formatting argument length.
+	// '*' or '$', length, "\r\n"
+	lenScratch [32]byte
+
+	// Scratch space for formatting integers and floats.
+	numScratch [40]byte
+}
+
+// DialTimeout acts like Dial but takes timeouts for establishing the
+// connection to the server, writing a command and reading a reply.
+//
+// Deprecated: Use Dial with options instead.
+func DialTimeout(network, address string, connectTimeout, readTimeout, writeTimeout time.Duration) (Conn, error) {
+	return Dial(network, address,
+		DialConnectTimeout(connectTimeout),
+		DialReadTimeout(readTimeout),
+		DialWriteTimeout(writeTimeout))
+}
+
+// DialOption specifies an option for dialing a Redis server.
+type DialOption struct {
+	f func(*dialOptions)
+}
+
+type dialOptions struct {
+	readTimeout  time.Duration
+	writeTimeout time.Duration
+	dialer       *net.Dialer
+	dial         func(network, addr string) (net.Conn, error)
+	db           int
+	password     string
+	useTLS       bool
+	skipVerify   bool
+	tlsConfig    *tls.Config
+}
+
+// DialReadTimeout specifies the timeout for reading a single command reply.
+func DialReadTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.readTimeout = d
+	}}
+}
+
+// DialWriteTimeout specifies the timeout for writing a single command.
+func DialWriteTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.writeTimeout = d
+	}}
+}
+
+// DialConnectTimeout specifies the timeout for connecting to the Redis server when
+// no DialNetDial option is specified.
+func DialConnectTimeout(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dialer.Timeout = d
+	}}
+}
+
+// DialKeepAlive specifies the keep-alive period for TCP connections to the Redis server
+// when no DialNetDial option is specified.
+// If zero, keep-alives are not enabled. If no DialKeepAlive option is specified then
+// the default of 5 minutes is used to ensure that half-closed TCP sessions are detected.
+func DialKeepAlive(d time.Duration) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dialer.KeepAlive = d
+	}}
+}
+
+// DialNetDial specifies a custom dial function for creating TCP
+// connections, otherwise a net.Dialer customized via the other options is used.
+// DialNetDial overrides DialConnectTimeout and DialKeepAlive.
+func DialNetDial(dial func(network, addr string) (net.Conn, error)) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.dial = dial
+	}}
+}
+
+// DialDatabase specifies the database to select when dialing a connection.
+func DialDatabase(db int) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.db = db
+	}}
+}
+
+// DialPassword specifies the password to use when connecting to
+// the Redis server.
+func DialPassword(password string) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.password = password
+	}}
+}
+
+// DialTLSConfig specifies the config to use when a TLS connection is dialed.
+// Has no effect when not dialing a TLS connection.
+func DialTLSConfig(c *tls.Config) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.tlsConfig = c
+	}}
+}
+
+// DialTLSSkipVerify disables server name verification when connecting over
+// TLS. Has no effect when not dialing a TLS connection.
+func DialTLSSkipVerify(skip bool) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.skipVerify = skip
+	}}
+}
+
+// DialUseTLS specifies whether TLS should be used when connecting to the
+// server. This option is ignore by DialURL.
+func DialUseTLS(useTLS bool) DialOption {
+	return DialOption{func(do *dialOptions) {
+		do.useTLS = useTLS
+	}}
+}
+
+// Dial connects to the Redis server at the given network and
+// address using the specified options.
+func Dial(network, address string, options ...DialOption) (Conn, error) {
+	do := dialOptions{
+		dialer: &net.Dialer{
+			KeepAlive: time.Minute * 5,
+		},
+	}
+	for _, option := range options {
+		option.f(&do)
+	}
+	if do.dial == nil {
+		do.dial = do.dialer.Dial
+	}
+
+	netConn, err := do.dial(network, address)
+	if err != nil {
+		return nil, err
+	}
+
+	if do.useTLS {
+		tlsConfig := cloneTLSClientConfig(do.tlsConfig, do.skipVerify)
+		if tlsConfig.ServerName == "" {
+			host, _, err := net.SplitHostPort(address)
+			if err != nil {
+				netConn.Close()
+				return nil, err
+			}
+			tlsConfig.ServerName = host
+		}
+
+		tlsConn := tls.Client(netConn, tlsConfig)
+		if err := tlsConn.Handshake(); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+		netConn = tlsConn
+	}
+
+	c := &conn{
+		conn:         netConn,
+		bw:           bufio.NewWriter(netConn),
+		br:           bufio.NewReader(netConn),
+		readTimeout:  do.readTimeout,
+		writeTimeout: do.writeTimeout,
+	}
+
+	if do.password != "" {
+		if _, err := c.Do("AUTH", do.password); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+	}
+
+	if do.db != 0 {
+		if _, err := c.Do("SELECT", do.db); err != nil {
+			netConn.Close()
+			return nil, err
+		}
+	}
+
+	return c, nil
+}
+
+var pathDBRegexp = regexp.MustCompile(`/(\d*)\z`)
+
+// DialURL connects to a Redis server at the given URL using the Redis
+// URI scheme. URLs should follow the draft IANA specification for the
+// scheme (https://www.iana.org/assignments/uri-schemes/prov/redis).
+func DialURL(rawurl string, options ...DialOption) (Conn, error) {
+	u, err := url.Parse(rawurl)
+	if err != nil {
+		return nil, err
+	}
+
+	if u.Scheme != "redis" && u.Scheme != "rediss" {
+		return nil, fmt.Errorf("invalid redis URL scheme: %s", u.Scheme)
+	}
+
+	// As per the IANA draft spec, the host defaults to localhost and
+	// the port defaults to 6379.
+	host, port, err := net.SplitHostPort(u.Host)
+	if err != nil {
+		// assume port is missing
+		host = u.Host
+		port = "6379"
+	}
+	if host == "" {
+		host = "localhost"
+	}
+	address := net.JoinHostPort(host, port)
+
+	if u.User != nil {
+		password, isSet := u.User.Password()
+		if isSet {
+			options = append(options, DialPassword(password))
+		}
+	}
+
+	match := pathDBRegexp.FindStringSubmatch(u.Path)
+	if len(match) == 2 {
+		db := 0
+		if len(match[1]) > 0 {
+			db, err = strconv.Atoi(match[1])
+			if err != nil {
+				return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+			}
+		}
+		if db != 0 {
+			options = append(options, DialDatabase(db))
+		}
+	} else if u.Path != "" {
+		return nil, fmt.Errorf("invalid database: %s", u.Path[1:])
+	}
+
+	options = append(options, DialUseTLS(u.Scheme == "rediss"))
+
+	return Dial("tcp", address, options...)
+}
+
+// NewConn returns a new Redigo connection for the given net connection.
+func NewConn(netConn net.Conn, readTimeout, writeTimeout time.Duration) Conn {
+	return &conn{
+		conn:         netConn,
+		bw:           bufio.NewWriter(netConn),
+		br:           bufio.NewReader(netConn),
+		readTimeout:  readTimeout,
+		writeTimeout: writeTimeout,
+	}
+}
+
+func (c *conn) Close() error {
+	c.mu.Lock()
+	err := c.err
+	if c.err == nil {
+		c.err = errors.New("redigo: closed")
+		err = c.conn.Close()
+	}
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) fatal(err error) error {
+	c.mu.Lock()
+	if c.err == nil {
+		c.err = err
+		// Close connection to force errors on subsequent calls and to unblock
+		// other reader or writer.
+		c.conn.Close()
+	}
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) Err() error {
+	c.mu.Lock()
+	err := c.err
+	c.mu.Unlock()
+	return err
+}
+
+func (c *conn) writeLen(prefix byte, n int) error {
+	c.lenScratch[len(c.lenScratch)-1] = '\n'
+	c.lenScratch[len(c.lenScratch)-2] = '\r'
+	i := len(c.lenScratch) - 3
+	for {
+		c.lenScratch[i] = byte('0' + n%10)
+		i -= 1
+		n = n / 10
+		if n == 0 {
+			break
+		}
+	}
+	c.lenScratch[i] = prefix
+	_, err := c.bw.Write(c.lenScratch[i:])
+	return err
+}
+
+func (c *conn) writeString(s string) error {
+	c.writeLen('$', len(s))
+	c.bw.WriteString(s)
+	_, err := c.bw.WriteString("\r\n")
+	return err
+}
+
+func (c *conn) writeBytes(p []byte) error {
+	c.writeLen('$', len(p))
+	c.bw.Write(p)
+	_, err := c.bw.WriteString("\r\n")
+	return err
+}
+
+func (c *conn) writeInt64(n int64) error {
+	return c.writeBytes(strconv.AppendInt(c.numScratch[:0], n, 10))
+}
+
+func (c *conn) writeFloat64(n float64) error {
+	return c.writeBytes(strconv.AppendFloat(c.numScratch[:0], n, 'g', -1, 64))
+}
+
+func (c *conn) writeCommand(cmd string, args []interface{}) error {
+	c.writeLen('*', 1+len(args))
+	if err := c.writeString(cmd); err != nil {
+		return err
+	}
+	for _, arg := range args {
+		if err := c.writeArg(arg, true); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *conn) writeArg(arg interface{}, argumentTypeOK bool) (err error) {
+	switch arg := arg.(type) {
+	case string:
+		return c.writeString(arg)
+	case []byte:
+		return c.writeBytes(arg)
+	case int:
+		return c.writeInt64(int64(arg))
+	case int64:
+		return c.writeInt64(arg)
+	case float64:
+		return c.writeFloat64(arg)
+	case bool:
+		if arg {
+			return c.writeString("1")
+		} else {
+			return c.writeString("0")
+		}
+	case nil:
+		return c.writeString("")
+	case Argument:
+		if argumentTypeOK {
+			return c.writeArg(arg.RedisArg(), false)
+		}
+		// See comment in default clause below.
+		var buf bytes.Buffer
+		fmt.Fprint(&buf, arg)
+		return c.writeBytes(buf.Bytes())
+	default:
+		// This default clause is intended to handle builtin numeric types.
+		// The function should return an error for other types, but this is not
+		// done for compatibility with previous versions of the package.
+		var buf bytes.Buffer
+		fmt.Fprint(&buf, arg)
+		return c.writeBytes(buf.Bytes())
+	}
+}
+
+type protocolError string
+
+func (pe protocolError) Error() string {
+	return fmt.Sprintf("redigo: %s (possible server error or unsupported concurrent read by application)", string(pe))
+}
+
+func (c *conn) readLine() ([]byte, error) {
+	p, err := c.br.ReadSlice('\n')
+	if err == bufio.ErrBufferFull {
+		return nil, protocolError("long response line")
+	}
+	if err != nil {
+		return nil, err
+	}
+	i := len(p) - 2
+	if i < 0 || p[i] != '\r' {
+		return nil, protocolError("bad response line terminator")
+	}
+	return p[:i], nil
+}
+
+// parseLen parses bulk string and array lengths.
+func parseLen(p []byte) (int, error) {
+	if len(p) == 0 {
+		return -1, protocolError("malformed length")
+	}
+
+	if p[0] == '-' && len(p) == 2 && p[1] == '1' {
+		// handle $-1 and $-1 null replies.
+		return -1, nil
+	}
+
+	var n int
+	for _, b := range p {
+		n *= 10
+		if b < '0' || b > '9' {
+			return -1, protocolError("illegal bytes in length")
+		}
+		n += int(b - '0')
+	}
+
+	return n, nil
+}
+
+// parseInt parses an integer reply.
+func parseInt(p []byte) (interface{}, error) {
+	if len(p) == 0 {
+		return 0, protocolError("malformed integer")
+	}
+
+	var negate bool
+	if p[0] == '-' {
+		negate = true
+		p = p[1:]
+		if len(p) == 0 {
+			return 0, protocolError("malformed integer")
+		}
+	}
+
+	var n int64
+	for _, b := range p {
+		n *= 10
+		if b < '0' || b > '9' {
+			return 0, protocolError("illegal bytes in length")
+		}
+		n += int64(b - '0')
+	}
+
+	if negate {
+		n = -n
+	}
+	return n, nil
+}
+
+var (
+	okReply   interface{} = "OK"
+	pongReply interface{} = "PONG"
+)
+
+func (c *conn) readReply() (interface{}, error) {
+	line, err := c.readLine()
+	if err != nil {
+		return nil, err
+	}
+	if len(line) == 0 {
+		return nil, protocolError("short response line")
+	}
+	switch line[0] {
+	case '+':
+		switch {
+		case len(line) == 3 && line[1] == 'O' && line[2] == 'K':
+			// Avoid allocation for frequent "+OK" response.
+			return okReply, nil
+		case len(line) == 5 && line[1] == 'P' && line[2] == 'O' && line[3] == 'N' && line[4] == 'G':
+			// Avoid allocation in PING command benchmarks :)
+			return pongReply, nil
+		default:
+			return string(line[1:]), nil
+		}
+	case '-':
+		return Error(string(line[1:])), nil
+	case ':':
+		return parseInt(line[1:])
+	case '$':
+		n, err := parseLen(line[1:])
+		if n < 0 || err != nil {
+			return nil, err
+		}
+		p := make([]byte, n)
+		_, err = io.ReadFull(c.br, p)
+		if err != nil {
+			return nil, err
+		}
+		if line, err := c.readLine(); err != nil {
+			return nil, err
+		} else if len(line) != 0 {
+			return nil, protocolError("bad bulk string format")
+		}
+		return p, nil
+	case '*':
+		n, err := parseLen(line[1:])
+		if n < 0 || err != nil {
+			return nil, err
+		}
+		r := make([]interface{}, n)
+		for i := range r {
+			r[i], err = c.readReply()
+			if err != nil {
+				return nil, err
+			}
+		}
+		return r, nil
+	}
+	return nil, protocolError("unexpected response line")
+}
+
+func (c *conn) Send(cmd string, args ...interface{}) error {
+	c.mu.Lock()
+	c.pending += 1
+	c.mu.Unlock()
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+	if err := c.writeCommand(cmd, args); err != nil {
+		return c.fatal(err)
+	}
+	return nil
+}
+
+func (c *conn) Flush() error {
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+	if err := c.bw.Flush(); err != nil {
+		return c.fatal(err)
+	}
+	return nil
+}
+
+func (c *conn) Receive() (reply interface{}, err error) {
+	if c.readTimeout != 0 {
+		c.conn.SetReadDeadline(time.Now().Add(c.readTimeout))
+	}
+	if reply, err = c.readReply(); err != nil {
+		return nil, c.fatal(err)
+	}
+	// When using pub/sub, the number of receives can be greater than the
+	// number of sends. To enable normal use of the connection after
+	// unsubscribing from all channels, we do not decrement pending to a
+	// negative value.
+	//
+	// The pending field is decremented after the reply is read to handle the
+	// case where Receive is called before Send.
+	c.mu.Lock()
+	if c.pending > 0 {
+		c.pending -= 1
+	}
+	c.mu.Unlock()
+	if err, ok := reply.(Error); ok {
+		return nil, err
+	}
+	return
+}
+
+func (c *conn) Do(cmd string, args ...interface{}) (interface{}, error) {
+	c.mu.Lock()
+	pending := c.pending
+	c.pending = 0
+	c.mu.Unlock()
+
+	if cmd == "" && pending == 0 {
+		return nil, nil
+	}
+
+	if c.writeTimeout != 0 {
+		c.conn.SetWriteDeadline(time.Now().Add(c.writeTimeout))
+	}
+
+	if cmd != "" {
+		if err := c.writeCommand(cmd, args); err != nil {
+			return nil, c.fatal(err)
+		}
+	}
+
+	if err := c.bw.Flush(); err != nil {
+		return nil, c.fatal(err)
+	}
+
+	if c.readTimeout != 0 {
+		c.conn.SetReadDeadline(time.Now().Add(c.readTimeout))
+	}
+
+	if cmd == "" {
+		reply := make([]interface{}, pending)
+		for i := range reply {
+			r, e := c.readReply()
+			if e != nil {
+				return nil, c.fatal(e)
+			}
+			reply[i] = r
+		}
+		return reply, nil
+	}
+
+	var err error
+	var reply interface{}
+	for i := 0; i <= pending; i++ {
+		var e error
+		if reply, e = c.readReply(); e != nil {
+			return nil, c.fatal(e)
+		}
+		if e, ok := reply.(Error); ok && err == nil {
+			err = e
+		}
+	}
+	return reply, err
+}
@@ -0,0 +1,823 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"bytes"
+	"crypto/tls"
+	"crypto/x509"
+	"fmt"
+	"io"
+	"math"
+	"net"
+	"os"
+	"reflect"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+type testConn struct {
+	io.Reader
+	io.Writer
+}
+
+func (*testConn) Close() error                       { return nil }
+func (*testConn) LocalAddr() net.Addr                { return nil }
+func (*testConn) RemoteAddr() net.Addr               { return nil }
+func (*testConn) SetDeadline(t time.Time) error      { return nil }
+func (*testConn) SetReadDeadline(t time.Time) error  { return nil }
+func (*testConn) SetWriteDeadline(t time.Time) error { return nil }
+
+func dialTestConn(r string, w io.Writer) redis.DialOption {
+	return redis.DialNetDial(func(network, addr string) (net.Conn, error) {
+		return &testConn{Reader: strings.NewReader(r), Writer: w}, nil
+	})
+}
+
+type tlsTestConn struct {
+	net.Conn
+	done chan struct{}
+}
+
+func (c *tlsTestConn) Close() error {
+	c.Conn.Close()
+	<-c.done
+	return nil
+}
+
+func dialTestConnTLS(r string, w io.Writer) redis.DialOption {
+	return redis.DialNetDial(func(network, addr string) (net.Conn, error) {
+		client, server := net.Pipe()
+		tlsServer := tls.Server(server, &serverTLSConfig)
+		go io.Copy(tlsServer, strings.NewReader(r))
+		done := make(chan struct{})
+		go func() {
+			io.Copy(w, tlsServer)
+			close(done)
+		}()
+		return &tlsTestConn{Conn: client, done: done}, nil
+	})
+}
+
+type durationArg struct {
+	time.Duration
+}
+
+func (t durationArg) RedisArg() interface{} {
+	return t.Seconds()
+}
+
+type recursiveArg int
+
+func (v recursiveArg) RedisArg() interface{} { return v }
+
+var writeTests = []struct {
+	args     []interface{}
+	expected string
+}{
+	{
+		[]interface{}{"SET", "key", "value"},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", "value"},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$5\r\nvalue\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", byte(100)},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$3\r\n100\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", 100},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$3\r\n100\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", int64(math.MinInt64)},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$20\r\n-9223372036854775808\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", float64(1349673917.939762)},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$21\r\n1.349673917939762e+09\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", ""},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$0\r\n\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", nil},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$0\r\n\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", durationArg{time.Minute}},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$2\r\n60\r\n",
+	},
+	{
+		[]interface{}{"SET", "key", recursiveArg(123)},
+		"*3\r\n$3\r\nSET\r\n$3\r\nkey\r\n$3\r\n123\r\n",
+	},
+	{
+		[]interface{}{"ECHO", true, false},
+		"*3\r\n$4\r\nECHO\r\n$1\r\n1\r\n$1\r\n0\r\n",
+	},
+}
+
+func TestWrite(t *testing.T) {
+	for _, tt := range writeTests {
+		var buf bytes.Buffer
+		c, _ := redis.Dial("", "", dialTestConn("", &buf))
+		err := c.Send(tt.args[0].(string), tt.args[1:]...)
+		if err != nil {
+			t.Errorf("Send(%v) returned error %v", tt.args, err)
+			continue
+		}
+		c.Flush()
+		actual := buf.String()
+		if actual != tt.expected {
+			t.Errorf("Send(%v) = %q, want %q", tt.args, actual, tt.expected)
+		}
+	}
+}
+
+var errorSentinel = &struct{}{}
+
+var readTests = []struct {
+	reply    string
+	expected interface{}
+}{
+	{
+		"+OK\r\n",
+		"OK",
+	},
+	{
+		"+PONG\r\n",
+		"PONG",
+	},
+	{
+		"@OK\r\n",
+		errorSentinel,
+	},
+	{
+		"$6\r\nfoobar\r\n",
+		[]byte("foobar"),
+	},
+	{
+		"$-1\r\n",
+		nil,
+	},
+	{
+		":1\r\n",
+		int64(1),
+	},
+	{
+		":-2\r\n",
+		int64(-2),
+	},
+	{
+		"*0\r\n",
+		[]interface{}{},
+	},
+	{
+		"*-1\r\n",
+		nil,
+	},
+	{
+		"*4\r\n$3\r\nfoo\r\n$3\r\nbar\r\n$5\r\nHello\r\n$5\r\nWorld\r\n",
+		[]interface{}{[]byte("foo"), []byte("bar"), []byte("Hello"), []byte("World")},
+	},
+	{
+		"*3\r\n$3\r\nfoo\r\n$-1\r\n$3\r\nbar\r\n",
+		[]interface{}{[]byte("foo"), nil, []byte("bar")},
+	},
+
+	{
+		// "x" is not a valid length
+		"$x\r\nfoobar\r\n",
+		errorSentinel,
+	},
+	{
+		// -2 is not a valid length
+		"$-2\r\n",
+		errorSentinel,
+	},
+	{
+		// "x"  is not a valid integer
+		":x\r\n",
+		errorSentinel,
+	},
+	{
+		// missing \r\n following value
+		"$6\r\nfoobar",
+		errorSentinel,
+	},
+	{
+		// short value
+		"$6\r\nxx",
+		errorSentinel,
+	},
+	{
+		// long value
+		"$6\r\nfoobarx\r\n",
+		errorSentinel,
+	},
+}
+
+func TestRead(t *testing.T) {
+	for _, tt := range readTests {
+		c, _ := redis.Dial("", "", dialTestConn(tt.reply, nil))
+		actual, err := c.Receive()
+		if tt.expected == errorSentinel {
+			if err == nil {
+				t.Errorf("Receive(%q) did not return expected error", tt.reply)
+			}
+		} else {
+			if err != nil {
+				t.Errorf("Receive(%q) returned error %v", tt.reply, err)
+				continue
+			}
+			if !reflect.DeepEqual(actual, tt.expected) {
+				t.Errorf("Receive(%q) = %v, want %v", tt.reply, actual, tt.expected)
+			}
+		}
+	}
+}
+
+var testCommands = []struct {
+	args     []interface{}
+	expected interface{}
+}{
+	{
+		[]interface{}{"PING"},
+		"PONG",
+	},
+	{
+		[]interface{}{"SET", "foo", "bar"},
+		"OK",
+	},
+	{
+		[]interface{}{"GET", "foo"},
+		[]byte("bar"),
+	},
+	{
+		[]interface{}{"GET", "nokey"},
+		nil,
+	},
+	{
+		[]interface{}{"MGET", "nokey", "foo"},
+		[]interface{}{nil, []byte("bar")},
+	},
+	{
+		[]interface{}{"INCR", "mycounter"},
+		int64(1),
+	},
+	{
+		[]interface{}{"LPUSH", "mylist", "foo"},
+		int64(1),
+	},
+	{
+		[]interface{}{"LPUSH", "mylist", "bar"},
+		int64(2),
+	},
+	{
+		[]interface{}{"LRANGE", "mylist", 0, -1},
+		[]interface{}{[]byte("bar"), []byte("foo")},
+	},
+	{
+		[]interface{}{"MULTI"},
+		"OK",
+	},
+	{
+		[]interface{}{"LRANGE", "mylist", 0, -1},
+		"QUEUED",
+	},
+	{
+		[]interface{}{"PING"},
+		"QUEUED",
+	},
+	{
+		[]interface{}{"EXEC"},
+		[]interface{}{
+			[]interface{}{[]byte("bar"), []byte("foo")},
+			"PONG",
+		},
+	},
+}
+
+func TestDoCommands(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	for _, cmd := range testCommands {
+		actual, err := c.Do(cmd.args[0].(string), cmd.args[1:]...)
+		if err != nil {
+			t.Errorf("Do(%v) returned error %v", cmd.args, err)
+			continue
+		}
+		if !reflect.DeepEqual(actual, cmd.expected) {
+			t.Errorf("Do(%v) = %v, want %v", cmd.args, actual, cmd.expected)
+		}
+	}
+}
+
+func TestPipelineCommands(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	for _, cmd := range testCommands {
+		if err := c.Send(cmd.args[0].(string), cmd.args[1:]...); err != nil {
+			t.Fatalf("Send(%v) returned error %v", cmd.args, err)
+		}
+	}
+	if err := c.Flush(); err != nil {
+		t.Errorf("Flush() returned error %v", err)
+	}
+	for _, cmd := range testCommands {
+		actual, err := c.Receive()
+		if err != nil {
+			t.Fatalf("Receive(%v) returned error %v", cmd.args, err)
+		}
+		if !reflect.DeepEqual(actual, cmd.expected) {
+			t.Errorf("Receive(%v) = %v, want %v", cmd.args, actual, cmd.expected)
+		}
+	}
+}
+
+func TestBlankCommmand(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	for _, cmd := range testCommands {
+		if err := c.Send(cmd.args[0].(string), cmd.args[1:]...); err != nil {
+			t.Fatalf("Send(%v) returned error %v", cmd.args, err)
+		}
+	}
+	reply, err := redis.Values(c.Do(""))
+	if err != nil {
+		t.Fatalf("Do() returned error %v", err)
+	}
+	if len(reply) != len(testCommands) {
+		t.Fatalf("len(reply)=%d, want %d", len(reply), len(testCommands))
+	}
+	for i, cmd := range testCommands {
+		actual := reply[i]
+		if !reflect.DeepEqual(actual, cmd.expected) {
+			t.Errorf("Receive(%v) = %v, want %v", cmd.args, actual, cmd.expected)
+		}
+	}
+}
+
+func TestRecvBeforeSend(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+	done := make(chan struct{})
+	go func() {
+		c.Receive()
+		close(done)
+	}()
+	time.Sleep(time.Millisecond)
+	c.Send("PING")
+	c.Flush()
+	<-done
+	_, err = c.Do("")
+	if err != nil {
+		t.Fatalf("error=%v", err)
+	}
+}
+
+func TestError(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	c.Do("SET", "key", "val")
+	_, err = c.Do("HSET", "key", "fld", "val")
+	if err == nil {
+		t.Errorf("Expected err for HSET on string key.")
+	}
+	if c.Err() != nil {
+		t.Errorf("Conn has Err()=%v, expect nil", c.Err())
+	}
+	_, err = c.Do("SET", "key", "val")
+	if err != nil {
+		t.Errorf("Do(SET, key, val) returned error %v, expected nil.", err)
+	}
+}
+
+func TestReadTimeout(t *testing.T) {
+	l, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("net.Listen returned %v", err)
+	}
+	defer l.Close()
+
+	go func() {
+		for {
+			c, err := l.Accept()
+			if err != nil {
+				return
+			}
+			go func() {
+				time.Sleep(time.Second)
+				c.Write([]byte("+OK\r\n"))
+				c.Close()
+			}()
+		}
+	}()
+
+	// Do
+
+	c1, err := redis.Dial(l.Addr().Network(), l.Addr().String(), redis.DialReadTimeout(time.Millisecond))
+	if err != nil {
+		t.Fatalf("redis.Dial returned %v", err)
+	}
+	defer c1.Close()
+
+	_, err = c1.Do("PING")
+	if err == nil {
+		t.Fatalf("c1.Do() returned nil, expect error")
+	}
+	if c1.Err() == nil {
+		t.Fatalf("c1.Err() = nil, expect error")
+	}
+
+	// Send/Flush/Receive
+
+	c2, err := redis.Dial(l.Addr().Network(), l.Addr().String(), redis.DialReadTimeout(time.Millisecond))
+	if err != nil {
+		t.Fatalf("redis.Dial returned %v", err)
+	}
+	defer c2.Close()
+
+	c2.Send("PING")
+	c2.Flush()
+	_, err = c2.Receive()
+	if err == nil {
+		t.Fatalf("c2.Receive() returned nil, expect error")
+	}
+	if c2.Err() == nil {
+		t.Fatalf("c2.Err() = nil, expect error")
+	}
+}
+
+var dialErrors = []struct {
+	rawurl        string
+	expectedError string
+}{
+	{
+		"localhost",
+		"invalid redis URL scheme",
+	},
+	// The error message for invalid hosts is different in different
+	// versions of Go, so just check that there is an error message.
+	{
+		"redis://weird url",
+		"",
+	},
+	{
+		"redis://foo:bar:baz",
+		"",
+	},
+	{
+		"http://www.google.com",
+		"invalid redis URL scheme: http",
+	},
+	{
+		"redis://localhost:6379/abc123",
+		"invalid database: abc123",
+	},
+}
+
+func TestDialURLErrors(t *testing.T) {
+	for _, d := range dialErrors {
+		_, err := redis.DialURL(d.rawurl)
+		if err == nil || !strings.Contains(err.Error(), d.expectedError) {
+			t.Errorf("DialURL did not return expected error (expected %v to contain %s)", err, d.expectedError)
+		}
+	}
+}
+
+func TestDialURLPort(t *testing.T) {
+	checkPort := func(network, address string) (net.Conn, error) {
+		if address != "localhost:6379" {
+			t.Errorf("DialURL did not set port to 6379 by default (got %v)", address)
+		}
+		return nil, nil
+	}
+	_, err := redis.DialURL("redis://localhost", redis.DialNetDial(checkPort))
+	if err != nil {
+		t.Error("dial error:", err)
+	}
+}
+
+func TestDialURLHost(t *testing.T) {
+	checkHost := func(network, address string) (net.Conn, error) {
+		if address != "localhost:6379" {
+			t.Errorf("DialURL did not set host to localhost by default (got %v)", address)
+		}
+		return nil, nil
+	}
+	_, err := redis.DialURL("redis://:6379", redis.DialNetDial(checkHost))
+	if err != nil {
+		t.Error("dial error:", err)
+	}
+}
+
+var dialURLTests = []struct {
+	description string
+	url         string
+	r           string
+	w           string
+}{
+	{"password", "redis://x:abc123@localhost", "+OK\r\n", "*2\r\n$4\r\nAUTH\r\n$6\r\nabc123\r\n"},
+	{"database 3", "redis://localhost/3", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$1\r\n3\r\n"},
+	{"database 99", "redis://localhost/99", "+OK\r\n", "*2\r\n$6\r\nSELECT\r\n$2\r\n99\r\n"},
+	{"no database", "redis://localhost/", "+OK\r\n", ""},
+}
+
+func TestDialURL(t *testing.T) {
+	for _, tt := range dialURLTests {
+		var buf bytes.Buffer
+		// UseTLS should be ignored in all of these tests.
+		_, err := redis.DialURL(tt.url, dialTestConn(tt.r, &buf), redis.DialUseTLS(true))
+		if err != nil {
+			t.Errorf("%s dial error: %v", tt.description, err)
+			continue
+		}
+		if w := buf.String(); w != tt.w {
+			t.Errorf("%s commands = %q, want %q", tt.description, w, tt.w)
+		}
+	}
+}
+
+func checkPingPong(t *testing.T, buf *bytes.Buffer, c redis.Conn) {
+	resp, err := c.Do("PING")
+	if err != nil {
+		t.Fatal("ping error:", err)
+	}
+	// Close connection to ensure that writes to buf are complete.
+	c.Close()
+	expected := "*1\r\n$4\r\nPING\r\n"
+	actual := buf.String()
+	if actual != expected {
+		t.Errorf("commands = %q, want %q", actual, expected)
+	}
+	if resp != "PONG" {
+		t.Errorf("resp = %v, want %v", resp, "PONG")
+	}
+}
+
+const pingResponse = "+PONG\r\n"
+
+func TestDialURLTLS(t *testing.T) {
+	var buf bytes.Buffer
+	c, err := redis.DialURL("rediss://example.com/",
+		redis.DialTLSConfig(&clientTLSConfig),
+		dialTestConnTLS(pingResponse, &buf))
+	if err != nil {
+		t.Fatal("dial error:", err)
+	}
+	checkPingPong(t, &buf, c)
+}
+
+func TestDialUseTLS(t *testing.T) {
+	var buf bytes.Buffer
+	c, err := redis.Dial("tcp", "example.com:6379",
+		redis.DialTLSConfig(&clientTLSConfig),
+		dialTestConnTLS(pingResponse, &buf),
+		redis.DialUseTLS(true))
+	if err != nil {
+		t.Fatal("dial error:", err)
+	}
+	checkPingPong(t, &buf, c)
+}
+
+func TestDialTLSSKipVerify(t *testing.T) {
+	var buf bytes.Buffer
+	c, err := redis.Dial("tcp", "example.com:6379",
+		dialTestConnTLS(pingResponse, &buf),
+		redis.DialTLSSkipVerify(true),
+		redis.DialUseTLS(true))
+	if err != nil {
+		t.Fatal("dial error:", err)
+	}
+	checkPingPong(t, &buf, c)
+}
+
+// Connect to local instance of Redis running on the default port.
+func ExampleDial() {
+	c, err := redis.Dial("tcp", ":6379")
+	if err != nil {
+		// handle error
+	}
+	defer c.Close()
+}
+
+// Connect to remote instance of Redis using a URL.
+func ExampleDialURL() {
+	c, err := redis.DialURL(os.Getenv("REDIS_URL"))
+	if err != nil {
+		// handle connection error
+	}
+	defer c.Close()
+}
+
+// TextExecError tests handling of errors in a transaction. See
+// http://redis.io/topics/transactions for information on how Redis handles
+// errors in a transaction.
+func TestExecError(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	// Execute commands that fail before EXEC is called.
+
+	c.Do("DEL", "k0")
+	c.Do("ZADD", "k0", 0, 0)
+	c.Send("MULTI")
+	c.Send("NOTACOMMAND", "k0", 0, 0)
+	c.Send("ZINCRBY", "k0", 0, 0)
+	v, err := c.Do("EXEC")
+	if err == nil {
+		t.Fatalf("EXEC returned values %v, expected error", v)
+	}
+
+	// Execute commands that fail after EXEC is called. The first command
+	// returns an error.
+
+	c.Do("DEL", "k1")
+	c.Do("ZADD", "k1", 0, 0)
+	c.Send("MULTI")
+	c.Send("HSET", "k1", 0, 0)
+	c.Send("ZINCRBY", "k1", 0, 0)
+	v, err = c.Do("EXEC")
+	if err != nil {
+		t.Fatalf("EXEC returned error %v", err)
+	}
+
+	vs, err := redis.Values(v, nil)
+	if err != nil {
+		t.Fatalf("Values(v) returned error %v", err)
+	}
+
+	if len(vs) != 2 {
+		t.Fatalf("len(vs) == %d, want 2", len(vs))
+	}
+
+	if _, ok := vs[0].(error); !ok {
+		t.Fatalf("first result is type %T, expected error", vs[0])
+	}
+
+	if _, ok := vs[1].([]byte); !ok {
+		t.Fatalf("second result is type %T, expected []byte", vs[1])
+	}
+
+	// Execute commands that fail after EXEC is called. The second command
+	// returns an error.
+
+	c.Do("ZADD", "k2", 0, 0)
+	c.Send("MULTI")
+	c.Send("ZINCRBY", "k2", 0, 0)
+	c.Send("HSET", "k2", 0, 0)
+	v, err = c.Do("EXEC")
+	if err != nil {
+		t.Fatalf("EXEC returned error %v", err)
+	}
+
+	vs, err = redis.Values(v, nil)
+	if err != nil {
+		t.Fatalf("Values(v) returned error %v", err)
+	}
+
+	if len(vs) != 2 {
+		t.Fatalf("len(vs) == %d, want 2", len(vs))
+	}
+
+	if _, ok := vs[0].([]byte); !ok {
+		t.Fatalf("first result is type %T, expected []byte", vs[0])
+	}
+
+	if _, ok := vs[1].(error); !ok {
+		t.Fatalf("second result is type %T, expected error", vs[2])
+	}
+}
+
+func BenchmarkDoEmpty(b *testing.B) {
+	b.StopTimer()
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer c.Close()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if _, err := c.Do(""); err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkDoPing(b *testing.B) {
+	b.StopTimer()
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		b.Fatal(err)
+	}
+	defer c.Close()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		if _, err := c.Do("PING"); err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+var clientTLSConfig, serverTLSConfig tls.Config
+
+func init() {
+	// The certificate and key for testing TLS dial options was created
+	// using the command
+	//
+	//   go run GOROOT/src/crypto/tls/generate_cert.go  \
+	//      --rsa-bits 1024 \
+	//      --host 127.0.0.1,::1,example.com --ca \
+	//      --start-date "Jan 1 00:00:00 1970" \
+	//      --duration=1000000h
+	//
+	// where GOROOT is the value of GOROOT reported by go env.
+	localhostCert := []byte(`
+-----BEGIN CERTIFICATE-----
+MIICFDCCAX2gAwIBAgIRAJfBL4CUxkXcdlFurb3K+iowDQYJKoZIhvcNAQELBQAw
+EjEQMA4GA1UEChMHQWNtZSBDbzAgFw03MDAxMDEwMDAwMDBaGA8yMDg0MDEyOTE2
+MDAwMFowEjEQMA4GA1UEChMHQWNtZSBDbzCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEArizw8WxMUQ3bGHLeuJ4fDrEpy+L2pqrbYRlKk1DasJ/VkB8bImzIpe6+
+LGjiYIxvnDCOJ3f3QplcQuiuMyl6f2irJlJsbFT8Lo/3obnuTKAIaqUdJUqBg6y+
+JaL8Auk97FvunfKFv8U1AIhgiLzAfQ/3Eaq1yi87Ra6pMjGbTtcCAwEAAaNoMGYw
+DgYDVR0PAQH/BAQDAgKkMBMGA1UdJQQMMAoGCCsGAQUFBwMBMA8GA1UdEwEB/wQF
+MAMBAf8wLgYDVR0RBCcwJYILZXhhbXBsZS5jb22HBH8AAAGHEAAAAAAAAAAAAAAA
+AAAAAAEwDQYJKoZIhvcNAQELBQADgYEAdZ8daIVkyhVwflt5I19m0oq1TycbGO1+
+ach7T6cZiBQeNR/SJtxr/wKPEpmvUgbv2BfFrKJ8QoIHYsbNSURTWSEa02pfw4k9
+6RQhij3ZkG79Ituj5OYRORV6Z0HUW32r670BtcuHuAhq7YA6Nxy4FtSt7bAlVdRt
+rrKgNsltzMk=
+-----END CERTIFICATE-----`)
+
+	localhostKey := []byte(`
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCuLPDxbExRDdsYct64nh8OsSnL4vamqtthGUqTUNqwn9WQHxsi
+bMil7r4saOJgjG+cMI4nd/dCmVxC6K4zKXp/aKsmUmxsVPwuj/ehue5MoAhqpR0l
+SoGDrL4lovwC6T3sW+6d8oW/xTUAiGCIvMB9D/cRqrXKLztFrqkyMZtO1wIDAQAB
+AoGACrc5G6FOEK6JjDeE/Fa+EmlT6PdNtXNNi+vCas3Opo8u1G8VfEi1D4BgstrB
+Eq+RLkrOdB8tVyuYQYWPMhabMqF+hhKJN72j0OwfuPlVvTInwb/cKjo/zbH1IA+Y
+HenHNK4ywv7/p/9/MvQPJ3I32cQBCgGUW5chVSH5M1sj5gECQQDabQAI1X0uDqCm
+KbX9gXVkAgxkFddrt6LBHt57xujFcqEKFE7nwKhDh7DweVs/VEJ+kpid4z+UnLOw
+KjtP9JolAkEAzCNBphQ//IsbH5rNs10wIUw3Ks/Oepicvr6kUFbIv+neRzi1iJHa
+m6H7EayK3PWgax6BAsR/t0Jc9XV7r2muSwJAVzN09BHnK+ADGtNEKLTqXMbEk6B0
+pDhn7ZmZUOkUPN+Kky+QYM11X6Bob1jDqQDGmymDbGUxGO+GfSofC8inUQJAGfci
+Eo3g1a6b9JksMPRZeuLG4ZstGErxJRH6tH1Va5PDwitka8qhk8o2tTjNMO3NSdLH
+diKoXBcE2/Pll5pJoQJBAIMiiMIzXJhnN4mX8may44J/HvMlMf2xuVH2gNMwmZuc
+Bjqn3yoLHaoZVvbWOi0C2TCN4FjXjaLNZGifQPbIcaA=
+-----END RSA PRIVATE KEY-----`)
+
+	cert, err := tls.X509KeyPair(localhostCert, localhostKey)
+	if err != nil {
+		panic(fmt.Sprintf("error creating key pair: %v", err))
+	}
+	serverTLSConfig.Certificates = []tls.Certificate{cert}
+
+	certificate, err := x509.ParseCertificate(serverTLSConfig.Certificates[0].Certificate[0])
+	if err != nil {
+		panic(fmt.Sprintf("error parsing x509 certificate: %v", err))
+	}
+
+	clientTLSConfig.RootCAs = x509.NewCertPool()
+	clientTLSConfig.RootCAs.AddCert(certificate)
+}
@@ -0,0 +1,177 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package redis is a client for the Redis database.
+//
+// The Redigo FAQ (https://github.com/garyburd/redigo/wiki/FAQ) contains more
+// documentation about this package.
+//
+// Connections
+//
+// The Conn interface is the primary interface for working with Redis.
+// Applications create connections by calling the Dial, DialWithTimeout or
+// NewConn functions. In the future, functions will be added for creating
+// sharded and other types of connections.
+//
+// The application must call the connection Close method when the application
+// is done with the connection.
+//
+// Executing Commands
+//
+// The Conn interface has a generic method for executing Redis commands:
+//
+//  Do(commandName string, args ...interface{}) (reply interface{}, err error)
+//
+// The Redis command reference (http://redis.io/commands) lists the available
+// commands. An example of using the Redis APPEND command is:
+//
+//  n, err := conn.Do("APPEND", "key", "value")
+//
+// The Do method converts command arguments to bulk strings for transmission
+// to the server as follows:
+//
+//  Go Type                 Conversion
+//  []byte                  Sent as is
+//  string                  Sent as is
+//  int, int64              strconv.FormatInt(v)
+//  float64                 strconv.FormatFloat(v, 'g', -1, 64)
+//  bool                    true -> "1", false -> "0"
+//  nil                     ""
+//  all other types         fmt.Fprint(w, v)
+//
+// Redis command reply types are represented using the following Go types:
+//
+//  Redis type              Go type
+//  error                   redis.Error
+//  integer                 int64
+//  simple string           string
+//  bulk string             []byte or nil if value not present.
+//  array                   []interface{} or nil if value not present.
+//
+// Use type assertions or the reply helper functions to convert from
+// interface{} to the specific Go type for the command result.
+//
+// Pipelining
+//
+// Connections support pipelining using the Send, Flush and Receive methods.
+//
+//  Send(commandName string, args ...interface{}) error
+//  Flush() error
+//  Receive() (reply interface{}, err error)
+//
+// Send writes the command to the connection's output buffer. Flush flushes the
+// connection's output buffer to the server. Receive reads a single reply from
+// the server. The following example shows a simple pipeline.
+//
+//  c.Send("SET", "foo", "bar")
+//  c.Send("GET", "foo")
+//  c.Flush()
+//  c.Receive() // reply from SET
+//  v, err = c.Receive() // reply from GET
+//
+// The Do method combines the functionality of the Send, Flush and Receive
+// methods. The Do method starts by writing the command and flushing the output
+// buffer. Next, the Do method receives all pending replies including the reply
+// for the command just sent by Do. If any of the received replies is an error,
+// then Do returns the error. If there are no errors, then Do returns the last
+// reply. If the command argument to the Do method is "", then the Do method
+// will flush the output buffer and receive pending replies without sending a
+// command.
+//
+// Use the Send and Do methods to implement pipelined transactions.
+//
+//  c.Send("MULTI")
+//  c.Send("INCR", "foo")
+//  c.Send("INCR", "bar")
+//  r, err := c.Do("EXEC")
+//  fmt.Println(r) // prints [1, 1]
+//
+// Concurrency
+//
+// Connections support one concurrent caller to the Receive method and one
+// concurrent caller to the Send and Flush methods. No other concurrency is
+// supported including concurrent calls to the Do method.
+//
+// For full concurrent access to Redis, use the thread-safe Pool to get, use
+// and release a connection from within a goroutine. Connections returned from
+// a Pool have the concurrency restrictions described in the previous
+// paragraph.
+//
+// Publish and Subscribe
+//
+// Use the Send, Flush and Receive methods to implement Pub/Sub subscribers.
+//
+//  c.Send("SUBSCRIBE", "example")
+//  c.Flush()
+//  for {
+//      reply, err := c.Receive()
+//      if err != nil {
+//          return err
+//      }
+//      // process pushed message
+//  }
+//
+// The PubSubConn type wraps a Conn with convenience methods for implementing
+// subscribers. The Subscribe, PSubscribe, Unsubscribe and PUnsubscribe methods
+// send and flush a subscription management command. The receive method
+// converts a pushed message to convenient types for use in a type switch.
+//
+//  psc := redis.PubSubConn{Conn: c}
+//  psc.Subscribe("example")
+//  for {
+//      switch v := psc.Receive().(type) {
+//      case redis.Message:
+//          fmt.Printf("%s: message: %s\n", v.Channel, v.Data)
+//      case redis.Subscription:
+//          fmt.Printf("%s: %s %d\n", v.Channel, v.Kind, v.Count)
+//      case error:
+//          return v
+//      }
+//  }
+//
+// Reply Helpers
+//
+// The Bool, Int, Bytes, String, Strings and Values functions convert a reply
+// to a value of a specific type. To allow convenient wrapping of calls to the
+// connection Do and Receive methods, the functions take a second argument of
+// type error.  If the error is non-nil, then the helper function returns the
+// error. If the error is nil, the function converts the reply to the specified
+// type:
+//
+//  exists, err := redis.Bool(c.Do("EXISTS", "foo"))
+//  if err != nil {
+//      // handle error return from c.Do or type conversion error.
+//  }
+//
+// The Scan function converts elements of a array reply to Go types:
+//
+//  var value1 int
+//  var value2 string
+//  reply, err := redis.Values(c.Do("MGET", "key1", "key2"))
+//  if err != nil {
+//      // handle error
+//  }
+//   if _, err := redis.Scan(reply, &value1, &value2); err != nil {
+//      // handle error
+//  }
+//
+// Errors
+//
+// Connection methods return error replies from the server as type redis.Error.
+//
+// Call the connection Err() method to determine if the connection encountered
+// non-recoverable error such as a network error or protocol parsing error. If
+// Err() returns a non-nil value, then the connection is not usable and should
+// be closed.
+package redis // import "github.com/garyburd/redigo/redis"
@@ -0,0 +1,33 @@
+// +build go1.7
+
+package redis
+
+import "crypto/tls"
+
+// similar cloneTLSClientConfig in the stdlib, but also honor skipVerify for the nil case
+func cloneTLSClientConfig(cfg *tls.Config, skipVerify bool) *tls.Config {
+	if cfg == nil {
+		return &tls.Config{InsecureSkipVerify: skipVerify}
+	}
+	return &tls.Config{
+		Rand:                        cfg.Rand,
+		Time:                        cfg.Time,
+		Certificates:                cfg.Certificates,
+		NameToCertificate:           cfg.NameToCertificate,
+		GetCertificate:              cfg.GetCertificate,
+		RootCAs:                     cfg.RootCAs,
+		NextProtos:                  cfg.NextProtos,
+		ServerName:                  cfg.ServerName,
+		ClientAuth:                  cfg.ClientAuth,
+		ClientCAs:                   cfg.ClientCAs,
+		InsecureSkipVerify:          cfg.InsecureSkipVerify,
+		CipherSuites:                cfg.CipherSuites,
+		PreferServerCipherSuites:    cfg.PreferServerCipherSuites,
+		ClientSessionCache:          cfg.ClientSessionCache,
+		MinVersion:                  cfg.MinVersion,
+		MaxVersion:                  cfg.MaxVersion,
+		CurvePreferences:            cfg.CurvePreferences,
+		DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled,
+		Renegotiation:               cfg.Renegotiation,
+	}
+}
@@ -0,0 +1,117 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bytes"
+	"fmt"
+	"log"
+)
+
+// NewLoggingConn returns a logging wrapper around a connection.
+func NewLoggingConn(conn Conn, logger *log.Logger, prefix string) Conn {
+	if prefix != "" {
+		prefix = prefix + "."
+	}
+	return &loggingConn{conn, logger, prefix}
+}
+
+type loggingConn struct {
+	Conn
+	logger *log.Logger
+	prefix string
+}
+
+func (c *loggingConn) Close() error {
+	err := c.Conn.Close()
+	var buf bytes.Buffer
+	fmt.Fprintf(&buf, "%sClose() -> (%v)", c.prefix, err)
+	c.logger.Output(2, buf.String())
+	return err
+}
+
+func (c *loggingConn) printValue(buf *bytes.Buffer, v interface{}) {
+	const chop = 32
+	switch v := v.(type) {
+	case []byte:
+		if len(v) > chop {
+			fmt.Fprintf(buf, "%q...", v[:chop])
+		} else {
+			fmt.Fprintf(buf, "%q", v)
+		}
+	case string:
+		if len(v) > chop {
+			fmt.Fprintf(buf, "%q...", v[:chop])
+		} else {
+			fmt.Fprintf(buf, "%q", v)
+		}
+	case []interface{}:
+		if len(v) == 0 {
+			buf.WriteString("[]")
+		} else {
+			sep := "["
+			fin := "]"
+			if len(v) > chop {
+				v = v[:chop]
+				fin = "...]"
+			}
+			for _, vv := range v {
+				buf.WriteString(sep)
+				c.printValue(buf, vv)
+				sep = ", "
+			}
+			buf.WriteString(fin)
+		}
+	default:
+		fmt.Fprint(buf, v)
+	}
+}
+
+func (c *loggingConn) print(method, commandName string, args []interface{}, reply interface{}, err error) {
+	var buf bytes.Buffer
+	fmt.Fprintf(&buf, "%s%s(", c.prefix, method)
+	if method != "Receive" {
+		buf.WriteString(commandName)
+		for _, arg := range args {
+			buf.WriteString(", ")
+			c.printValue(&buf, arg)
+		}
+	}
+	buf.WriteString(") -> (")
+	if method != "Send" {
+		c.printValue(&buf, reply)
+		buf.WriteString(", ")
+	}
+	fmt.Fprintf(&buf, "%v)", err)
+	c.logger.Output(3, buf.String())
+}
+
+func (c *loggingConn) Do(commandName string, args ...interface{}) (interface{}, error) {
+	reply, err := c.Conn.Do(commandName, args...)
+	c.print("Do", commandName, args, reply, err)
+	return reply, err
+}
+
+func (c *loggingConn) Send(commandName string, args ...interface{}) error {
+	err := c.Conn.Send(commandName, args...)
+	c.print("Send", commandName, args, nil, err)
+	return err
+}
+
+func (c *loggingConn) Receive() (interface{}, error) {
+	reply, err := c.Conn.Receive()
+	c.print("Receive", "", nil, reply, err)
+	return reply, err
+}
@@ -0,0 +1,442 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bytes"
+	"container/list"
+	"crypto/rand"
+	"crypto/sha1"
+	"errors"
+	"io"
+	"strconv"
+	"sync"
+	"time"
+
+	"github.com/garyburd/redigo/internal"
+)
+
+var nowFunc = time.Now // for testing
+
+// ErrPoolExhausted is returned from a pool connection method (Do, Send,
+// Receive, Flush, Err) when the maximum number of database connections in the
+// pool has been reached.
+var ErrPoolExhausted = errors.New("redigo: connection pool exhausted")
+
+var (
+	errPoolClosed = errors.New("redigo: connection pool closed")
+	errConnClosed = errors.New("redigo: connection closed")
+)
+
+// Pool maintains a pool of connections. The application calls the Get method
+// to get a connection from the pool and the connection's Close method to
+// return the connection's resources to the pool.
+//
+// The following example shows how to use a pool in a web application. The
+// application creates a pool at application startup and makes it available to
+// request handlers using a package level variable. The pool configuration used
+// here is an example, not a recommendation.
+//
+//  func newPool(addr string) *redis.Pool {
+//    return &redis.Pool{
+//      MaxIdle: 3,
+//      IdleTimeout: 240 * time.Second,
+//      Dial: func () (redis.Conn, error) { return redis.Dial("tcp", addr) },
+//    }
+//  }
+//
+//  var (
+//    pool *redis.Pool
+//    redisServer = flag.String("redisServer", ":6379", "")
+//  )
+//
+//  func main() {
+//    flag.Parse()
+//    pool = newPool(*redisServer)
+//    ...
+//  }
+//
+// A request handler gets a connection from the pool and closes the connection
+// when the handler is done:
+//
+//  func serveHome(w http.ResponseWriter, r *http.Request) {
+//      conn := pool.Get()
+//      defer conn.Close()
+//      ...
+//  }
+//
+// Use the Dial function to authenticate connections with the AUTH command or
+// select a database with the SELECT command:
+//
+//  pool := &redis.Pool{
+//    // Other pool configuration not shown in this example.
+//    Dial: func () (redis.Conn, error) {
+//      c, err := redis.Dial("tcp", server)
+//      if err != nil {
+//        return nil, err
+//      }
+//      if _, err := c.Do("AUTH", password); err != nil {
+//        c.Close()
+//        return nil, err
+//      }
+//      if _, err := c.Do("SELECT", db); err != nil {
+//        c.Close()
+//        return nil, err
+//      }
+//      return c, nil
+//    }
+//  }
+//
+// Use the TestOnBorrow function to check the health of an idle connection
+// before the connection is returned to the application. This example PINGs
+// connections that have been idle more than a minute:
+//
+//  pool := &redis.Pool{
+//    // Other pool configuration not shown in this example.
+//    TestOnBorrow: func(c redis.Conn, t time.Time) error {
+//      if time.Since(t) < time.Minute {
+//        return nil
+//      }
+//      _, err := c.Do("PING")
+//      return err
+//    },
+//  }
+//
+type Pool struct {
+	// Dial is an application supplied function for creating and configuring a
+	// connection.
+	//
+	// The connection returned from Dial must not be in a special state
+	// (subscribed to pubsub channel, transaction started, ...).
+	Dial func() (Conn, error)
+
+	// TestOnBorrow is an optional application supplied function for checking
+	// the health of an idle connection before the connection is used again by
+	// the application. Argument t is the time that the connection was returned
+	// to the pool. If the function returns an error, then the connection is
+	// closed.
+	TestOnBorrow func(c Conn, t time.Time) error
+
+	// Maximum number of idle connections in the pool.
+	MaxIdle int
+
+	// Maximum number of connections allocated by the pool at a given time.
+	// When zero, there is no limit on the number of connections in the pool.
+	MaxActive int
+
+	// Close connections after remaining idle for this duration. If the value
+	// is zero, then idle connections are not closed. Applications should set
+	// the timeout to a value less than the server's timeout.
+	IdleTimeout time.Duration
+
+	// If Wait is true and the pool is at the MaxActive limit, then Get() waits
+	// for a connection to be returned to the pool before returning.
+	Wait bool
+
+	// mu protects fields defined below.
+	mu     sync.Mutex
+	cond   *sync.Cond
+	closed bool
+	active int
+
+	// Stack of idleConn with most recently used at the front.
+	idle list.List
+}
+
+type idleConn struct {
+	c Conn
+	t time.Time
+}
+
+// NewPool creates a new pool.
+//
+// Deprecated: Initialize the Pool directory as shown in the example.
+func NewPool(newFn func() (Conn, error), maxIdle int) *Pool {
+	return &Pool{Dial: newFn, MaxIdle: maxIdle}
+}
+
+// Get gets a connection. The application must close the returned connection.
+// This method always returns a valid connection so that applications can defer
+// error handling to the first use of the connection. If there is an error
+// getting an underlying connection, then the connection Err, Do, Send, Flush
+// and Receive methods return that error.
+func (p *Pool) Get() Conn {
+	c, err := p.get()
+	if err != nil {
+		return errorConnection{err}
+	}
+	return &pooledConnection{p: p, c: c}
+}
+
+// PoolStats contains pool statistics.
+type PoolStats struct {
+	// ActiveCount is the number of connections in the pool. The count includes idle connections and connections in use.
+	ActiveCount int
+	// IdleCount is the number of idle connections in the pool.
+	IdleCount int
+}
+
+// Stats returns pool's statistics.
+func (p *Pool) Stats() PoolStats {
+	p.mu.Lock()
+	stats := PoolStats{
+		ActiveCount: p.active,
+		IdleCount:   p.idle.Len(),
+	}
+	p.mu.Unlock()
+
+	return stats
+}
+
+// ActiveCount returns the number of connections in the pool. The count includes idle connections and connections in use.
+func (p *Pool) ActiveCount() int {
+	p.mu.Lock()
+	active := p.active
+	p.mu.Unlock()
+	return active
+}
+
+// IdleCount returns the number of idle connections in the pool.
+func (p *Pool) IdleCount() int {
+	p.mu.Lock()
+	idle := p.idle.Len()
+	p.mu.Unlock()
+	return idle
+}
+
+// Close releases the resources used by the pool.
+func (p *Pool) Close() error {
+	p.mu.Lock()
+	idle := p.idle
+	p.idle.Init()
+	p.closed = true
+	p.active -= idle.Len()
+	if p.cond != nil {
+		p.cond.Broadcast()
+	}
+	p.mu.Unlock()
+	for e := idle.Front(); e != nil; e = e.Next() {
+		e.Value.(idleConn).c.Close()
+	}
+	return nil
+}
+
+// release decrements the active count and signals waiters. The caller must
+// hold p.mu during the call.
+func (p *Pool) release() {
+	p.active -= 1
+	if p.cond != nil {
+		p.cond.Signal()
+	}
+}
+
+// get prunes stale connections and returns a connection from the idle list or
+// creates a new connection.
+func (p *Pool) get() (Conn, error) {
+	p.mu.Lock()
+
+	// Prune stale connections.
+
+	if timeout := p.IdleTimeout; timeout > 0 {
+		for i, n := 0, p.idle.Len(); i < n; i++ {
+			e := p.idle.Back()
+			if e == nil {
+				break
+			}
+			ic := e.Value.(idleConn)
+			if ic.t.Add(timeout).After(nowFunc()) {
+				break
+			}
+			p.idle.Remove(e)
+			p.release()
+			p.mu.Unlock()
+			ic.c.Close()
+			p.mu.Lock()
+		}
+	}
+
+	for {
+		// Get idle connection.
+
+		for i, n := 0, p.idle.Len(); i < n; i++ {
+			e := p.idle.Front()
+			if e == nil {
+				break
+			}
+			ic := e.Value.(idleConn)
+			p.idle.Remove(e)
+			test := p.TestOnBorrow
+			p.mu.Unlock()
+			if test == nil || test(ic.c, ic.t) == nil {
+				return ic.c, nil
+			}
+			ic.c.Close()
+			p.mu.Lock()
+			p.release()
+		}
+
+		// Check for pool closed before dialing a new connection.
+
+		if p.closed {
+			p.mu.Unlock()
+			return nil, errors.New("redigo: get on closed pool")
+		}
+
+		// Dial new connection if under limit.
+
+		if p.MaxActive == 0 || p.active < p.MaxActive {
+			dial := p.Dial
+			p.active += 1
+			p.mu.Unlock()
+			c, err := dial()
+			if err != nil {
+				p.mu.Lock()
+				p.release()
+				p.mu.Unlock()
+				c = nil
+			}
+			return c, err
+		}
+
+		if !p.Wait {
+			p.mu.Unlock()
+			return nil, ErrPoolExhausted
+		}
+
+		if p.cond == nil {
+			p.cond = sync.NewCond(&p.mu)
+		}
+		p.cond.Wait()
+	}
+}
+
+func (p *Pool) put(c Conn, forceClose bool) error {
+	err := c.Err()
+	p.mu.Lock()
+	if !p.closed && err == nil && !forceClose {
+		p.idle.PushFront(idleConn{t: nowFunc(), c: c})
+		if p.idle.Len() > p.MaxIdle {
+			c = p.idle.Remove(p.idle.Back()).(idleConn).c
+		} else {
+			c = nil
+		}
+	}
+
+	if c == nil {
+		if p.cond != nil {
+			p.cond.Signal()
+		}
+		p.mu.Unlock()
+		return nil
+	}
+
+	p.release()
+	p.mu.Unlock()
+	return c.Close()
+}
+
+type pooledConnection struct {
+	p     *Pool
+	c     Conn
+	state int
+}
+
+var (
+	sentinel     []byte
+	sentinelOnce sync.Once
+)
+
+func initSentinel() {
+	p := make([]byte, 64)
+	if _, err := rand.Read(p); err == nil {
+		sentinel = p
+	} else {
+		h := sha1.New()
+		io.WriteString(h, "Oops, rand failed. Use time instead.")
+		io.WriteString(h, strconv.FormatInt(time.Now().UnixNano(), 10))
+		sentinel = h.Sum(nil)
+	}
+}
+
+func (pc *pooledConnection) Close() error {
+	c := pc.c
+	if _, ok := c.(errorConnection); ok {
+		return nil
+	}
+	pc.c = errorConnection{errConnClosed}
+
+	if pc.state&internal.MultiState != 0 {
+		c.Send("DISCARD")
+		pc.state &^= (internal.MultiState | internal.WatchState)
+	} else if pc.state&internal.WatchState != 0 {
+		c.Send("UNWATCH")
+		pc.state &^= internal.WatchState
+	}
+	if pc.state&internal.SubscribeState != 0 {
+		c.Send("UNSUBSCRIBE")
+		c.Send("PUNSUBSCRIBE")
+		// To detect the end of the message stream, ask the server to echo
+		// a sentinel value and read until we see that value.
+		sentinelOnce.Do(initSentinel)
+		c.Send("ECHO", sentinel)
+		c.Flush()
+		for {
+			p, err := c.Receive()
+			if err != nil {
+				break
+			}
+			if p, ok := p.([]byte); ok && bytes.Equal(p, sentinel) {
+				pc.state &^= internal.SubscribeState
+				break
+			}
+		}
+	}
+	c.Do("")
+	pc.p.put(c, pc.state != 0)
+	return nil
+}
+
+func (pc *pooledConnection) Err() error {
+	return pc.c.Err()
+}
+
+func (pc *pooledConnection) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
+	ci := internal.LookupCommandInfo(commandName)
+	pc.state = (pc.state | ci.Set) &^ ci.Clear
+	return pc.c.Do(commandName, args...)
+}
+
+func (pc *pooledConnection) Send(commandName string, args ...interface{}) error {
+	ci := internal.LookupCommandInfo(commandName)
+	pc.state = (pc.state | ci.Set) &^ ci.Clear
+	return pc.c.Send(commandName, args...)
+}
+
+func (pc *pooledConnection) Flush() error {
+	return pc.c.Flush()
+}
+
+func (pc *pooledConnection) Receive() (reply interface{}, err error) {
+	return pc.c.Receive()
+}
+
+type errorConnection struct{ err error }
+
+func (ec errorConnection) Do(string, ...interface{}) (interface{}, error) { return nil, ec.err }
+func (ec errorConnection) Send(string, ...interface{}) error              { return ec.err }
+func (ec errorConnection) Err() error                                     { return ec.err }
+func (ec errorConnection) Close() error                                   { return ec.err }
+func (ec errorConnection) Flush() error                                   { return ec.err }
+func (ec errorConnection) Receive() (interface{}, error)                  { return nil, ec.err }
@@ -0,0 +1,691 @@
+// Copyright 2011 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"errors"
+	"io"
+	"reflect"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+type poolTestConn struct {
+	d   *poolDialer
+	err error
+	redis.Conn
+}
+
+func (c *poolTestConn) Close() error {
+	c.d.mu.Lock()
+	c.d.open -= 1
+	c.d.mu.Unlock()
+	return c.Conn.Close()
+}
+
+func (c *poolTestConn) Err() error { return c.err }
+
+func (c *poolTestConn) Do(commandName string, args ...interface{}) (interface{}, error) {
+	if commandName == "ERR" {
+		c.err = args[0].(error)
+		commandName = "PING"
+	}
+	if commandName != "" {
+		c.d.commands = append(c.d.commands, commandName)
+	}
+	return c.Conn.Do(commandName, args...)
+}
+
+func (c *poolTestConn) Send(commandName string, args ...interface{}) error {
+	c.d.commands = append(c.d.commands, commandName)
+	return c.Conn.Send(commandName, args...)
+}
+
+type poolDialer struct {
+	mu       sync.Mutex
+	t        *testing.T
+	dialed   int
+	open     int
+	commands []string
+	dialErr  error
+}
+
+func (d *poolDialer) dial() (redis.Conn, error) {
+	d.mu.Lock()
+	d.dialed += 1
+	dialErr := d.dialErr
+	d.mu.Unlock()
+	if dialErr != nil {
+		return nil, d.dialErr
+	}
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		return nil, err
+	}
+	d.mu.Lock()
+	d.open += 1
+	d.mu.Unlock()
+	return &poolTestConn{d: d, Conn: c}, nil
+}
+
+func (d *poolDialer) check(message string, p *redis.Pool, dialed, open, inuse int) {
+	d.mu.Lock()
+	if d.dialed != dialed {
+		d.t.Errorf("%s: dialed=%d, want %d", message, d.dialed, dialed)
+	}
+	if d.open != open {
+		d.t.Errorf("%s: open=%d, want %d", message, d.open, open)
+	}
+
+	stats := p.Stats()
+
+	if stats.ActiveCount != open {
+		d.t.Errorf("%s: active=%d, want %d", message, stats.ActiveCount, open)
+	}
+	if stats.IdleCount != open-inuse {
+		d.t.Errorf("%s: idle=%d, want %d", message, stats.IdleCount, open-inuse)
+	}
+
+	d.mu.Unlock()
+}
+
+func TestPoolReuse(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle: 2,
+		Dial:    d.dial,
+	}
+
+	for i := 0; i < 10; i++ {
+		c1 := p.Get()
+		c1.Do("PING")
+		c2 := p.Get()
+		c2.Do("PING")
+		c1.Close()
+		c2.Close()
+	}
+
+	d.check("before close", p, 2, 2, 0)
+	p.Close()
+	d.check("after close", p, 2, 0, 0)
+}
+
+func TestPoolMaxIdle(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle: 2,
+		Dial:    d.dial,
+	}
+	defer p.Close()
+
+	for i := 0; i < 10; i++ {
+		c1 := p.Get()
+		c1.Do("PING")
+		c2 := p.Get()
+		c2.Do("PING")
+		c3 := p.Get()
+		c3.Do("PING")
+		c1.Close()
+		c2.Close()
+		c3.Close()
+	}
+	d.check("before close", p, 12, 2, 0)
+	p.Close()
+	d.check("after close", p, 12, 0, 0)
+}
+
+func TestPoolError(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle: 2,
+		Dial:    d.dial,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	c.Do("ERR", io.EOF)
+	if c.Err() == nil {
+		t.Errorf("expected c.Err() != nil")
+	}
+	c.Close()
+
+	c = p.Get()
+	c.Do("ERR", io.EOF)
+	c.Close()
+
+	d.check(".", p, 2, 0, 0)
+}
+
+func TestPoolClose(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle: 2,
+		Dial:    d.dial,
+	}
+	defer p.Close()
+
+	c1 := p.Get()
+	c1.Do("PING")
+	c2 := p.Get()
+	c2.Do("PING")
+	c3 := p.Get()
+	c3.Do("PING")
+
+	c1.Close()
+	if _, err := c1.Do("PING"); err == nil {
+		t.Errorf("expected error after connection closed")
+	}
+
+	c2.Close()
+	c2.Close()
+
+	p.Close()
+
+	d.check("after pool close", p, 3, 1, 1)
+
+	if _, err := c1.Do("PING"); err == nil {
+		t.Errorf("expected error after connection and pool closed")
+	}
+
+	c3.Close()
+
+	d.check("after conn close", p, 3, 0, 0)
+
+	c1 = p.Get()
+	if _, err := c1.Do("PING"); err == nil {
+		t.Errorf("expected error after pool closed")
+	}
+}
+
+func TestPoolTimeout(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:     2,
+		IdleTimeout: 300 * time.Second,
+		Dial:        d.dial,
+	}
+	defer p.Close()
+
+	now := time.Now()
+	redis.SetNowFunc(func() time.Time { return now })
+	defer redis.SetNowFunc(time.Now)
+
+	c := p.Get()
+	c.Do("PING")
+	c.Close()
+
+	d.check("1", p, 1, 1, 0)
+
+	now = now.Add(p.IdleTimeout)
+
+	c = p.Get()
+	c.Do("PING")
+	c.Close()
+
+	d.check("2", p, 2, 1, 0)
+}
+
+func TestPoolConcurrenSendReceive(t *testing.T) {
+	p := &redis.Pool{
+		Dial: redis.DialDefaultServer,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	done := make(chan error, 1)
+	go func() {
+		_, err := c.Receive()
+		done <- err
+	}()
+	c.Send("PING")
+	c.Flush()
+	err := <-done
+	if err != nil {
+		t.Fatalf("Receive() returned error %v", err)
+	}
+	_, err = c.Do("")
+	if err != nil {
+		t.Fatalf("Do() returned error %v", err)
+	}
+	c.Close()
+}
+
+func TestPoolBorrowCheck(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:      2,
+		Dial:         d.dial,
+		TestOnBorrow: func(redis.Conn, time.Time) error { return redis.Error("BLAH") },
+	}
+	defer p.Close()
+
+	for i := 0; i < 10; i++ {
+		c := p.Get()
+		c.Do("PING")
+		c.Close()
+	}
+	d.check("1", p, 10, 1, 0)
+}
+
+func TestPoolMaxActive(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   2,
+		MaxActive: 2,
+		Dial:      d.dial,
+	}
+	defer p.Close()
+
+	c1 := p.Get()
+	c1.Do("PING")
+	c2 := p.Get()
+	c2.Do("PING")
+
+	d.check("1", p, 2, 2, 2)
+
+	c3 := p.Get()
+	if _, err := c3.Do("PING"); err != redis.ErrPoolExhausted {
+		t.Errorf("expected pool exhausted")
+	}
+
+	c3.Close()
+	d.check("2", p, 2, 2, 2)
+	c2.Close()
+	d.check("3", p, 2, 2, 1)
+
+	c3 = p.Get()
+	if _, err := c3.Do("PING"); err != nil {
+		t.Errorf("expected good channel, err=%v", err)
+	}
+	c3.Close()
+
+	d.check("4", p, 2, 2, 1)
+}
+
+func TestPoolMonitorCleanup(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   2,
+		MaxActive: 2,
+		Dial:      d.dial,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	c.Send("MONITOR")
+	c.Close()
+
+	d.check("", p, 1, 0, 0)
+}
+
+func TestPoolPubSubCleanup(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   2,
+		MaxActive: 2,
+		Dial:      d.dial,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	c.Send("SUBSCRIBE", "x")
+	c.Close()
+
+	want := []string{"SUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE", "ECHO"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+
+	c = p.Get()
+	c.Send("PSUBSCRIBE", "x*")
+	c.Close()
+
+	want = []string{"PSUBSCRIBE", "UNSUBSCRIBE", "PUNSUBSCRIBE", "ECHO"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+}
+
+func TestPoolTransactionCleanup(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   2,
+		MaxActive: 2,
+		Dial:      d.dial,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	c.Do("WATCH", "key")
+	c.Do("PING")
+	c.Close()
+
+	want := []string{"WATCH", "PING", "UNWATCH"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+
+	c = p.Get()
+	c.Do("WATCH", "key")
+	c.Do("UNWATCH")
+	c.Do("PING")
+	c.Close()
+
+	want = []string{"WATCH", "UNWATCH", "PING"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+
+	c = p.Get()
+	c.Do("WATCH", "key")
+	c.Do("MULTI")
+	c.Do("PING")
+	c.Close()
+
+	want = []string{"WATCH", "MULTI", "PING", "DISCARD"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+
+	c = p.Get()
+	c.Do("WATCH", "key")
+	c.Do("MULTI")
+	c.Do("DISCARD")
+	c.Do("PING")
+	c.Close()
+
+	want = []string{"WATCH", "MULTI", "DISCARD", "PING"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+
+	c = p.Get()
+	c.Do("WATCH", "key")
+	c.Do("MULTI")
+	c.Do("EXEC")
+	c.Do("PING")
+	c.Close()
+
+	want = []string{"WATCH", "MULTI", "EXEC", "PING"}
+	if !reflect.DeepEqual(d.commands, want) {
+		t.Errorf("got commands %v, want %v", d.commands, want)
+	}
+	d.commands = nil
+}
+
+func startGoroutines(p *redis.Pool, cmd string, args ...interface{}) chan error {
+	errs := make(chan error, 10)
+	for i := 0; i < cap(errs); i++ {
+		go func() {
+			c := p.Get()
+			_, err := c.Do(cmd, args...)
+			c.Close()
+			errs <- err
+		}()
+	}
+
+	// Wait for goroutines to block.
+	time.Sleep(time.Second / 4)
+
+	return errs
+}
+
+func TestWaitPool(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   1,
+		MaxActive: 1,
+		Dial:      d.dial,
+		Wait:      true,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	errs := startGoroutines(p, "PING")
+	d.check("before close", p, 1, 1, 1)
+	c.Close()
+	timeout := time.After(2 * time.Second)
+	for i := 0; i < cap(errs); i++ {
+		select {
+		case err := <-errs:
+			if err != nil {
+				t.Fatal(err)
+			}
+		case <-timeout:
+			t.Fatalf("timeout waiting for blocked goroutine %d", i)
+		}
+	}
+	d.check("done", p, 1, 1, 0)
+}
+
+func TestWaitPoolClose(t *testing.T) {
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   1,
+		MaxActive: 1,
+		Dial:      d.dial,
+		Wait:      true,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	if _, err := c.Do("PING"); err != nil {
+		t.Fatal(err)
+	}
+	errs := startGoroutines(p, "PING")
+	d.check("before close", p, 1, 1, 1)
+	p.Close()
+	timeout := time.After(2 * time.Second)
+	for i := 0; i < cap(errs); i++ {
+		select {
+		case err := <-errs:
+			switch err {
+			case nil:
+				t.Fatal("blocked goroutine did not get error")
+			case redis.ErrPoolExhausted:
+				t.Fatal("blocked goroutine got pool exhausted error")
+			}
+		case <-timeout:
+			t.Fatal("timeout waiting for blocked goroutine")
+		}
+	}
+	c.Close()
+	d.check("done", p, 1, 0, 0)
+}
+
+func TestWaitPoolCommandError(t *testing.T) {
+	testErr := errors.New("test")
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   1,
+		MaxActive: 1,
+		Dial:      d.dial,
+		Wait:      true,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	errs := startGoroutines(p, "ERR", testErr)
+	d.check("before close", p, 1, 1, 1)
+	c.Close()
+	timeout := time.After(2 * time.Second)
+	for i := 0; i < cap(errs); i++ {
+		select {
+		case err := <-errs:
+			if err != nil {
+				t.Fatal(err)
+			}
+		case <-timeout:
+			t.Fatalf("timeout waiting for blocked goroutine %d", i)
+		}
+	}
+	d.check("done", p, cap(errs), 0, 0)
+}
+
+func TestWaitPoolDialError(t *testing.T) {
+	testErr := errors.New("test")
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   1,
+		MaxActive: 1,
+		Dial:      d.dial,
+		Wait:      true,
+	}
+	defer p.Close()
+
+	c := p.Get()
+	errs := startGoroutines(p, "ERR", testErr)
+	d.check("before close", p, 1, 1, 1)
+
+	d.dialErr = errors.New("dial")
+	c.Close()
+
+	nilCount := 0
+	errCount := 0
+	timeout := time.After(2 * time.Second)
+	for i := 0; i < cap(errs); i++ {
+		select {
+		case err := <-errs:
+			switch err {
+			case nil:
+				nilCount++
+			case d.dialErr:
+				errCount++
+			default:
+				t.Fatalf("expected dial error or nil, got %v", err)
+			}
+		case <-timeout:
+			t.Fatalf("timeout waiting for blocked goroutine %d", i)
+		}
+	}
+	if nilCount != 1 {
+		t.Errorf("expected one nil error, got %d", nilCount)
+	}
+	if errCount != cap(errs)-1 {
+		t.Errorf("expected %d dial errors, got %d", cap(errs)-1, errCount)
+	}
+	d.check("done", p, cap(errs), 0, 0)
+}
+
+// Borrowing requires us to iterate over the idle connections, unlock the pool,
+// and perform a blocking operation to check the connection still works. If
+// TestOnBorrow fails, we must reacquire the lock and continue iteration. This
+// test ensures that iteration will work correctly if multiple threads are
+// iterating simultaneously.
+func TestLocking_TestOnBorrowFails_PoolDoesntCrash(t *testing.T) {
+	const count = 100
+
+	// First we'll Create a pool where the pilfering of idle connections fails.
+	d := poolDialer{t: t}
+	p := &redis.Pool{
+		MaxIdle:   count,
+		MaxActive: count,
+		Dial:      d.dial,
+		TestOnBorrow: func(c redis.Conn, t time.Time) error {
+			return errors.New("No way back into the real world.")
+		},
+	}
+	defer p.Close()
+
+	// Fill the pool with idle connections.
+	conns := make([]redis.Conn, count)
+	for i := range conns {
+		conns[i] = p.Get()
+	}
+	for i := range conns {
+		conns[i].Close()
+	}
+
+	// Spawn a bunch of goroutines to thrash the pool.
+	var wg sync.WaitGroup
+	wg.Add(count)
+	for i := 0; i < count; i++ {
+		go func() {
+			c := p.Get()
+			if c.Err() != nil {
+				t.Errorf("pool get failed: %v", c.Err())
+			}
+			c.Close()
+			wg.Done()
+		}()
+	}
+	wg.Wait()
+	if d.dialed != count*2 {
+		t.Errorf("Expected %d dials, got %d", count*2, d.dialed)
+	}
+}
+
+func BenchmarkPoolGet(b *testing.B) {
+	b.StopTimer()
+	p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
+	c := p.Get()
+	if err := c.Err(); err != nil {
+		b.Fatal(err)
+	}
+	c.Close()
+	defer p.Close()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c = p.Get()
+		c.Close()
+	}
+}
+
+func BenchmarkPoolGetErr(b *testing.B) {
+	b.StopTimer()
+	p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
+	c := p.Get()
+	if err := c.Err(); err != nil {
+		b.Fatal(err)
+	}
+	c.Close()
+	defer p.Close()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c = p.Get()
+		if err := c.Err(); err != nil {
+			b.Fatal(err)
+		}
+		c.Close()
+	}
+}
+
+func BenchmarkPoolGetPing(b *testing.B) {
+	b.StopTimer()
+	p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
+	c := p.Get()
+	if err := c.Err(); err != nil {
+		b.Fatal(err)
+	}
+	c.Close()
+	defer p.Close()
+	b.StartTimer()
+	for i := 0; i < b.N; i++ {
+		c = p.Get()
+		if _, err := c.Do("PING"); err != nil {
+			b.Fatal(err)
+		}
+		c.Close()
+	}
+}
@@ -0,0 +1,31 @@
+// +build !go1.7
+
+package redis
+
+import "crypto/tls"
+
+// similar cloneTLSClientConfig in the stdlib, but also honor skipVerify for the nil case
+func cloneTLSClientConfig(cfg *tls.Config, skipVerify bool) *tls.Config {
+	if cfg == nil {
+		return &tls.Config{InsecureSkipVerify: skipVerify}
+	}
+	return &tls.Config{
+		Rand:                     cfg.Rand,
+		Time:                     cfg.Time,
+		Certificates:             cfg.Certificates,
+		NameToCertificate:        cfg.NameToCertificate,
+		GetCertificate:           cfg.GetCertificate,
+		RootCAs:                  cfg.RootCAs,
+		NextProtos:               cfg.NextProtos,
+		ServerName:               cfg.ServerName,
+		ClientAuth:               cfg.ClientAuth,
+		ClientCAs:                cfg.ClientCAs,
+		InsecureSkipVerify:       cfg.InsecureSkipVerify,
+		CipherSuites:             cfg.CipherSuites,
+		PreferServerCipherSuites: cfg.PreferServerCipherSuites,
+		ClientSessionCache:       cfg.ClientSessionCache,
+		MinVersion:               cfg.MinVersion,
+		MaxVersion:               cfg.MaxVersion,
+		CurvePreferences:         cfg.CurvePreferences,
+	}
+}
@@ -0,0 +1,144 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import "errors"
+
+// Subscription represents a subscribe or unsubscribe notification.
+type Subscription struct {
+	// Kind is "subscribe", "unsubscribe", "psubscribe" or "punsubscribe"
+	Kind string
+
+	// The channel that was changed.
+	Channel string
+
+	// The current number of subscriptions for connection.
+	Count int
+}
+
+// Message represents a message notification.
+type Message struct {
+	// The originating channel.
+	Channel string
+
+	// The message data.
+	Data []byte
+}
+
+// PMessage represents a pmessage notification.
+type PMessage struct {
+	// The matched pattern.
+	Pattern string
+
+	// The originating channel.
+	Channel string
+
+	// The message data.
+	Data []byte
+}
+
+// Pong represents a pubsub pong notification.
+type Pong struct {
+	Data string
+}
+
+// PubSubConn wraps a Conn with convenience methods for subscribers.
+type PubSubConn struct {
+	Conn Conn
+}
+
+// Close closes the connection.
+func (c PubSubConn) Close() error {
+	return c.Conn.Close()
+}
+
+// Subscribe subscribes the connection to the specified channels.
+func (c PubSubConn) Subscribe(channel ...interface{}) error {
+	c.Conn.Send("SUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// PSubscribe subscribes the connection to the given patterns.
+func (c PubSubConn) PSubscribe(channel ...interface{}) error {
+	c.Conn.Send("PSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// Unsubscribe unsubscribes the connection from the given channels, or from all
+// of them if none is given.
+func (c PubSubConn) Unsubscribe(channel ...interface{}) error {
+	c.Conn.Send("UNSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// PUnsubscribe unsubscribes the connection from the given patterns, or from all
+// of them if none is given.
+func (c PubSubConn) PUnsubscribe(channel ...interface{}) error {
+	c.Conn.Send("PUNSUBSCRIBE", channel...)
+	return c.Conn.Flush()
+}
+
+// Ping sends a PING to the server with the specified data.
+//
+// The connection must be subscribed to at least one channel or pattern when
+// calling this method.
+func (c PubSubConn) Ping(data string) error {
+	c.Conn.Send("PING", data)
+	return c.Conn.Flush()
+}
+
+// Receive returns a pushed message as a Subscription, Message, PMessage, Pong
+// or error. The return value is intended to be used directly in a type switch
+// as illustrated in the PubSubConn example.
+func (c PubSubConn) Receive() interface{} {
+	reply, err := Values(c.Conn.Receive())
+	if err != nil {
+		return err
+	}
+
+	var kind string
+	reply, err = Scan(reply, &kind)
+	if err != nil {
+		return err
+	}
+
+	switch kind {
+	case "message":
+		var m Message
+		if _, err := Scan(reply, &m.Channel, &m.Data); err != nil {
+			return err
+		}
+		return m
+	case "pmessage":
+		var pm PMessage
+		if _, err := Scan(reply, &pm.Pattern, &pm.Channel, &pm.Data); err != nil {
+			return err
+		}
+		return pm
+	case "subscribe", "psubscribe", "unsubscribe", "punsubscribe":
+		s := Subscription{Kind: kind}
+		if _, err := Scan(reply, &s.Channel, &s.Count); err != nil {
+			return err
+		}
+		return s
+	case "pong":
+		var p Pong
+		if _, err := Scan(reply, &p.Data); err != nil {
+			return err
+		}
+		return p
+	}
+	return errors.New("redigo: unknown pubsub notification")
+}
@@ -0,0 +1,165 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// +build go1.7
+
+package redis_test
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+// listenPubSubChannels listens for messages on Redis pubsub channels. The
+// onStart function is called after the channels are subscribed. The onMessage
+// function is called for each message.
+func listenPubSubChannels(ctx context.Context, redisServerAddr string,
+	onStart func() error,
+	onMessage func(channel string, data []byte) error,
+	channels ...string) error {
+	// A ping is set to the server with this period to test for the health of
+	// the connection and server.
+	const healthCheckPeriod = time.Minute
+
+	c, err := redis.Dial("tcp", redisServerAddr,
+		// Read timeout on server should be greater than ping period.
+		redis.DialReadTimeout(healthCheckPeriod+10*time.Second),
+		redis.DialWriteTimeout(10*time.Second))
+	if err != nil {
+		return err
+	}
+	defer c.Close()
+
+	psc := redis.PubSubConn{Conn: c}
+
+	if err := psc.Subscribe(redis.Args{}.AddFlat(channels)...); err != nil {
+		return err
+	}
+
+	done := make(chan error, 1)
+
+	// Start a goroutine to receive notifications from the server.
+	go func() {
+		for {
+			switch n := psc.Receive().(type) {
+			case error:
+				done <- n
+				return
+			case redis.Message:
+				if err := onMessage(n.Channel, n.Data); err != nil {
+					done <- err
+					return
+				}
+			case redis.Subscription:
+				switch n.Count {
+				case len(channels):
+					// Notify application when all channels are subscribed.
+					if err := onStart(); err != nil {
+						done <- err
+						return
+					}
+				case 0:
+					// Return from the goroutine when all channels are unsubscribed.
+					done <- nil
+					return
+				}
+			}
+		}
+	}()
+
+	ticker := time.NewTicker(healthCheckPeriod)
+	defer ticker.Stop()
+loop:
+	for err == nil {
+		select {
+		case <-ticker.C:
+			// Send ping to test health of connection and server. If
+			// corresponding pong is not received, then receive on the
+			// connection will timeout and the receive goroutine will exit.
+			if err = psc.Ping(""); err != nil {
+				break loop
+			}
+		case <-ctx.Done():
+			break loop
+		case err := <-done:
+			// Return error from the receive goroutine.
+			return err
+		}
+	}
+
+	// Signal the receiving goroutine to exit by unsubscribing from all channels.
+	psc.Unsubscribe()
+
+	// Wait for goroutine to complete.
+	return <-done
+}
+
+func publish() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Do("PUBLISH", "c1", "hello")
+	c.Do("PUBLISH", "c2", "world")
+	c.Do("PUBLISH", "c1", "goodbye")
+}
+
+// This example shows how receive pubsub notifications with cancelation and
+// health checks.
+func ExamplePubSubConn() {
+	redisServerAddr, err := serverAddr()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	ctx, cancel := context.WithCancel(context.Background())
+
+	err = listenPubSubChannels(ctx,
+		redisServerAddr,
+		func() error {
+			// The start callback is a good place to backfill missed
+			// notifications. For the purpose of this example, a goroutine is
+			// started to send notifications.
+			go publish()
+			return nil
+		},
+		func(channel string, message []byte) error {
+			fmt.Printf("channel: %s, message: %s\n", channel, message)
+
+			// For the purpose of this example, cancel the listener's context
+			// after receiving last message sent by publish().
+			if string(message) == "goodbye" {
+				cancel()
+			}
+			return nil
+		},
+		"c1", "c2")
+
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	// Output:
+	// channel: c1, message: hello
+	// channel: c2, message: world
+	// channel: c1, message: goodbye
+}
@@ -0,0 +1,67 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+func expectPushed(t *testing.T, c redis.PubSubConn, message string, expected interface{}) {
+	actual := c.Receive()
+	if !reflect.DeepEqual(actual, expected) {
+		t.Errorf("%s = %v, want %v", message, actual, expected)
+	}
+}
+
+func TestPushed(t *testing.T) {
+	pc, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer pc.Close()
+
+	sc, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer sc.Close()
+
+	c := redis.PubSubConn{Conn: sc}
+
+	c.Subscribe("c1")
+	expectPushed(t, c, "Subscribe(c1)", redis.Subscription{Kind: "subscribe", Channel: "c1", Count: 1})
+	c.Subscribe("c2")
+	expectPushed(t, c, "Subscribe(c2)", redis.Subscription{Kind: "subscribe", Channel: "c2", Count: 2})
+	c.PSubscribe("p1")
+	expectPushed(t, c, "PSubscribe(p1)", redis.Subscription{Kind: "psubscribe", Channel: "p1", Count: 3})
+	c.PSubscribe("p2")
+	expectPushed(t, c, "PSubscribe(p2)", redis.Subscription{Kind: "psubscribe", Channel: "p2", Count: 4})
+	c.PUnsubscribe()
+	expectPushed(t, c, "Punsubscribe(p1)", redis.Subscription{Kind: "punsubscribe", Channel: "p1", Count: 3})
+	expectPushed(t, c, "Punsubscribe()", redis.Subscription{Kind: "punsubscribe", Channel: "p2", Count: 2})
+
+	pc.Do("PUBLISH", "c1", "hello")
+	expectPushed(t, c, "PUBLISH c1 hello", redis.Message{Channel: "c1", Data: []byte("hello")})
+
+	c.Ping("hello")
+	expectPushed(t, c, `Ping("hello")`, redis.Pong{Data: "hello"})
+
+	c.Conn.Send("PING")
+	c.Conn.Flush()
+	expectPushed(t, c, `Send("PING")`, redis.Pong{})
+}
@@ -0,0 +1,61 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+// Error represents an error returned in a command reply.
+type Error string
+
+func (err Error) Error() string { return string(err) }
+
+// Conn represents a connection to a Redis server.
+type Conn interface {
+	// Close closes the connection.
+	Close() error
+
+	// Err returns a non-nil value when the connection is not usable.
+	Err() error
+
+	// Do sends a command to the server and returns the received reply.
+	Do(commandName string, args ...interface{}) (reply interface{}, err error)
+
+	// Send writes the command to the client's output buffer.
+	Send(commandName string, args ...interface{}) error
+
+	// Flush flushes the output buffer to the Redis server.
+	Flush() error
+
+	// Receive receives a single reply from the Redis server
+	Receive() (reply interface{}, err error)
+}
+
+// Argument is the interface implemented by an object which wants to control how
+// the object is converted to Redis bulk strings.
+type Argument interface {
+	// RedisArg returns a value to be encoded as a bulk string per the
+	// conversions listed in the section 'Executing Commands'.
+	// Implementations should typically return a []byte or string.
+	RedisArg() interface{}
+}
+
+// Scanner is implemented by an object which wants to control its value is
+// interpreted when read from Redis.
+type Scanner interface {
+	// RedisScan assigns a value from a Redis value. The argument src is one of
+	// the reply types listed in the section `Executing Commands`.
+	//
+	// An error should be returned if the value cannot be stored without
+	// loss of information.
+	RedisScan(src interface{}) error
+}
@@ -0,0 +1,479 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"errors"
+	"fmt"
+	"strconv"
+)
+
+// ErrNil indicates that a reply value is nil.
+var ErrNil = errors.New("redigo: nil returned")
+
+// Int is a helper that converts a command reply to an integer. If err is not
+// equal to nil, then Int returns 0, err. Otherwise, Int converts the
+// reply to an int as follows:
+//
+//  Reply type    Result
+//  integer       int(reply), nil
+//  bulk string   parsed reply, nil
+//  nil           0, ErrNil
+//  other         0, error
+func Int(reply interface{}, err error) (int, error) {
+	if err != nil {
+		return 0, err
+	}
+	switch reply := reply.(type) {
+	case int64:
+		x := int(reply)
+		if int64(x) != reply {
+			return 0, strconv.ErrRange
+		}
+		return x, nil
+	case []byte:
+		n, err := strconv.ParseInt(string(reply), 10, 0)
+		return int(n), err
+	case nil:
+		return 0, ErrNil
+	case Error:
+		return 0, reply
+	}
+	return 0, fmt.Errorf("redigo: unexpected type for Int, got type %T", reply)
+}
+
+// Int64 is a helper that converts a command reply to 64 bit integer. If err is
+// not equal to nil, then Int returns 0, err. Otherwise, Int64 converts the
+// reply to an int64 as follows:
+//
+//  Reply type    Result
+//  integer       reply, nil
+//  bulk string   parsed reply, nil
+//  nil           0, ErrNil
+//  other         0, error
+func Int64(reply interface{}, err error) (int64, error) {
+	if err != nil {
+		return 0, err
+	}
+	switch reply := reply.(type) {
+	case int64:
+		return reply, nil
+	case []byte:
+		n, err := strconv.ParseInt(string(reply), 10, 64)
+		return n, err
+	case nil:
+		return 0, ErrNil
+	case Error:
+		return 0, reply
+	}
+	return 0, fmt.Errorf("redigo: unexpected type for Int64, got type %T", reply)
+}
+
+var errNegativeInt = errors.New("redigo: unexpected value for Uint64")
+
+// Uint64 is a helper that converts a command reply to 64 bit integer. If err is
+// not equal to nil, then Int returns 0, err. Otherwise, Int64 converts the
+// reply to an int64 as follows:
+//
+//  Reply type    Result
+//  integer       reply, nil
+//  bulk string   parsed reply, nil
+//  nil           0, ErrNil
+//  other         0, error
+func Uint64(reply interface{}, err error) (uint64, error) {
+	if err != nil {
+		return 0, err
+	}
+	switch reply := reply.(type) {
+	case int64:
+		if reply < 0 {
+			return 0, errNegativeInt
+		}
+		return uint64(reply), nil
+	case []byte:
+		n, err := strconv.ParseUint(string(reply), 10, 64)
+		return n, err
+	case nil:
+		return 0, ErrNil
+	case Error:
+		return 0, reply
+	}
+	return 0, fmt.Errorf("redigo: unexpected type for Uint64, got type %T", reply)
+}
+
+// Float64 is a helper that converts a command reply to 64 bit float. If err is
+// not equal to nil, then Float64 returns 0, err. Otherwise, Float64 converts
+// the reply to an int as follows:
+//
+//  Reply type    Result
+//  bulk string   parsed reply, nil
+//  nil           0, ErrNil
+//  other         0, error
+func Float64(reply interface{}, err error) (float64, error) {
+	if err != nil {
+		return 0, err
+	}
+	switch reply := reply.(type) {
+	case []byte:
+		n, err := strconv.ParseFloat(string(reply), 64)
+		return n, err
+	case nil:
+		return 0, ErrNil
+	case Error:
+		return 0, reply
+	}
+	return 0, fmt.Errorf("redigo: unexpected type for Float64, got type %T", reply)
+}
+
+// String is a helper that converts a command reply to a string. If err is not
+// equal to nil, then String returns "", err. Otherwise String converts the
+// reply to a string as follows:
+//
+//  Reply type      Result
+//  bulk string     string(reply), nil
+//  simple string   reply, nil
+//  nil             "",  ErrNil
+//  other           "",  error
+func String(reply interface{}, err error) (string, error) {
+	if err != nil {
+		return "", err
+	}
+	switch reply := reply.(type) {
+	case []byte:
+		return string(reply), nil
+	case string:
+		return reply, nil
+	case nil:
+		return "", ErrNil
+	case Error:
+		return "", reply
+	}
+	return "", fmt.Errorf("redigo: unexpected type for String, got type %T", reply)
+}
+
+// Bytes is a helper that converts a command reply to a slice of bytes. If err
+// is not equal to nil, then Bytes returns nil, err. Otherwise Bytes converts
+// the reply to a slice of bytes as follows:
+//
+//  Reply type      Result
+//  bulk string     reply, nil
+//  simple string   []byte(reply), nil
+//  nil             nil, ErrNil
+//  other           nil, error
+func Bytes(reply interface{}, err error) ([]byte, error) {
+	if err != nil {
+		return nil, err
+	}
+	switch reply := reply.(type) {
+	case []byte:
+		return reply, nil
+	case string:
+		return []byte(reply), nil
+	case nil:
+		return nil, ErrNil
+	case Error:
+		return nil, reply
+	}
+	return nil, fmt.Errorf("redigo: unexpected type for Bytes, got type %T", reply)
+}
+
+// Bool is a helper that converts a command reply to a boolean. If err is not
+// equal to nil, then Bool returns false, err. Otherwise Bool converts the
+// reply to boolean as follows:
+//
+//  Reply type      Result
+//  integer         value != 0, nil
+//  bulk string     strconv.ParseBool(reply)
+//  nil             false, ErrNil
+//  other           false, error
+func Bool(reply interface{}, err error) (bool, error) {
+	if err != nil {
+		return false, err
+	}
+	switch reply := reply.(type) {
+	case int64:
+		return reply != 0, nil
+	case []byte:
+		return strconv.ParseBool(string(reply))
+	case nil:
+		return false, ErrNil
+	case Error:
+		return false, reply
+	}
+	return false, fmt.Errorf("redigo: unexpected type for Bool, got type %T", reply)
+}
+
+// MultiBulk is a helper that converts an array command reply to a []interface{}.
+//
+// Deprecated: Use Values instead.
+func MultiBulk(reply interface{}, err error) ([]interface{}, error) { return Values(reply, err) }
+
+// Values is a helper that converts an array command reply to a []interface{}.
+// If err is not equal to nil, then Values returns nil, err. Otherwise, Values
+// converts the reply as follows:
+//
+//  Reply type      Result
+//  array           reply, nil
+//  nil             nil, ErrNil
+//  other           nil, error
+func Values(reply interface{}, err error) ([]interface{}, error) {
+	if err != nil {
+		return nil, err
+	}
+	switch reply := reply.(type) {
+	case []interface{}:
+		return reply, nil
+	case nil:
+		return nil, ErrNil
+	case Error:
+		return nil, reply
+	}
+	return nil, fmt.Errorf("redigo: unexpected type for Values, got type %T", reply)
+}
+
+func sliceHelper(reply interface{}, err error, name string, makeSlice func(int), assign func(int, interface{}) error) error {
+	if err != nil {
+		return err
+	}
+	switch reply := reply.(type) {
+	case []interface{}:
+		makeSlice(len(reply))
+		for i := range reply {
+			if reply[i] == nil {
+				continue
+			}
+			if err := assign(i, reply[i]); err != nil {
+				return err
+			}
+		}
+		return nil
+	case nil:
+		return ErrNil
+	case Error:
+		return reply
+	}
+	return fmt.Errorf("redigo: unexpected type for %s, got type %T", name, reply)
+}
+
+// Float64s is a helper that converts an array command reply to a []float64. If
+// err is not equal to nil, then Float64s returns nil, err. Nil array items are
+// converted to 0 in the output slice. Floats64 returns an error if an array
+// item is not a bulk string or nil.
+func Float64s(reply interface{}, err error) ([]float64, error) {
+	var result []float64
+	err = sliceHelper(reply, err, "Float64s", func(n int) { result = make([]float64, n) }, func(i int, v interface{}) error {
+		p, ok := v.([]byte)
+		if !ok {
+			return fmt.Errorf("redigo: unexpected element type for Floats64, got type %T", v)
+		}
+		f, err := strconv.ParseFloat(string(p), 64)
+		result[i] = f
+		return err
+	})
+	return result, err
+}
+
+// Strings is a helper that converts an array command reply to a []string. If
+// err is not equal to nil, then Strings returns nil, err. Nil array items are
+// converted to "" in the output slice. Strings returns an error if an array
+// item is not a bulk string or nil.
+func Strings(reply interface{}, err error) ([]string, error) {
+	var result []string
+	err = sliceHelper(reply, err, "Strings", func(n int) { result = make([]string, n) }, func(i int, v interface{}) error {
+		switch v := v.(type) {
+		case string:
+			result[i] = v
+			return nil
+		case []byte:
+			result[i] = string(v)
+			return nil
+		default:
+			return fmt.Errorf("redigo: unexpected element type for Strings, got type %T", v)
+		}
+	})
+	return result, err
+}
+
+// ByteSlices is a helper that converts an array command reply to a [][]byte.
+// If err is not equal to nil, then ByteSlices returns nil, err. Nil array
+// items are stay nil. ByteSlices returns an error if an array item is not a
+// bulk string or nil.
+func ByteSlices(reply interface{}, err error) ([][]byte, error) {
+	var result [][]byte
+	err = sliceHelper(reply, err, "ByteSlices", func(n int) { result = make([][]byte, n) }, func(i int, v interface{}) error {
+		p, ok := v.([]byte)
+		if !ok {
+			return fmt.Errorf("redigo: unexpected element type for ByteSlices, got type %T", v)
+		}
+		result[i] = p
+		return nil
+	})
+	return result, err
+}
+
+// Int64s is a helper that converts an array command reply to a []int64.
+// If err is not equal to nil, then Int64s returns nil, err. Nil array
+// items are stay nil. Int64s returns an error if an array item is not a
+// bulk string or nil.
+func Int64s(reply interface{}, err error) ([]int64, error) {
+	var result []int64
+	err = sliceHelper(reply, err, "Int64s", func(n int) { result = make([]int64, n) }, func(i int, v interface{}) error {
+		switch v := v.(type) {
+		case int64:
+			result[i] = v
+			return nil
+		case []byte:
+			n, err := strconv.ParseInt(string(v), 10, 64)
+			result[i] = n
+			return err
+		default:
+			return fmt.Errorf("redigo: unexpected element type for Int64s, got type %T", v)
+		}
+	})
+	return result, err
+}
+
+// Ints is a helper that converts an array command reply to a []in.
+// If err is not equal to nil, then Ints returns nil, err. Nil array
+// items are stay nil. Ints returns an error if an array item is not a
+// bulk string or nil.
+func Ints(reply interface{}, err error) ([]int, error) {
+	var result []int
+	err = sliceHelper(reply, err, "Ints", func(n int) { result = make([]int, n) }, func(i int, v interface{}) error {
+		switch v := v.(type) {
+		case int64:
+			n := int(v)
+			if int64(n) != v {
+				return strconv.ErrRange
+			}
+			result[i] = n
+			return nil
+		case []byte:
+			n, err := strconv.Atoi(string(v))
+			result[i] = n
+			return err
+		default:
+			return fmt.Errorf("redigo: unexpected element type for Ints, got type %T", v)
+		}
+	})
+	return result, err
+}
+
+// StringMap is a helper that converts an array of strings (alternating key, value)
+// into a map[string]string. The HGETALL and CONFIG GET commands return replies in this format.
+// Requires an even number of values in result.
+func StringMap(result interface{}, err error) (map[string]string, error) {
+	values, err := Values(result, err)
+	if err != nil {
+		return nil, err
+	}
+	if len(values)%2 != 0 {
+		return nil, errors.New("redigo: StringMap expects even number of values result")
+	}
+	m := make(map[string]string, len(values)/2)
+	for i := 0; i < len(values); i += 2 {
+		key, okKey := values[i].([]byte)
+		value, okValue := values[i+1].([]byte)
+		if !okKey || !okValue {
+			return nil, errors.New("redigo: StringMap key not a bulk string value")
+		}
+		m[string(key)] = string(value)
+	}
+	return m, nil
+}
+
+// IntMap is a helper that converts an array of strings (alternating key, value)
+// into a map[string]int. The HGETALL commands return replies in this format.
+// Requires an even number of values in result.
+func IntMap(result interface{}, err error) (map[string]int, error) {
+	values, err := Values(result, err)
+	if err != nil {
+		return nil, err
+	}
+	if len(values)%2 != 0 {
+		return nil, errors.New("redigo: IntMap expects even number of values result")
+	}
+	m := make(map[string]int, len(values)/2)
+	for i := 0; i < len(values); i += 2 {
+		key, ok := values[i].([]byte)
+		if !ok {
+			return nil, errors.New("redigo: IntMap key not a bulk string value")
+		}
+		value, err := Int(values[i+1], nil)
+		if err != nil {
+			return nil, err
+		}
+		m[string(key)] = value
+	}
+	return m, nil
+}
+
+// Int64Map is a helper that converts an array of strings (alternating key, value)
+// into a map[string]int64. The HGETALL commands return replies in this format.
+// Requires an even number of values in result.
+func Int64Map(result interface{}, err error) (map[string]int64, error) {
+	values, err := Values(result, err)
+	if err != nil {
+		return nil, err
+	}
+	if len(values)%2 != 0 {
+		return nil, errors.New("redigo: Int64Map expects even number of values result")
+	}
+	m := make(map[string]int64, len(values)/2)
+	for i := 0; i < len(values); i += 2 {
+		key, ok := values[i].([]byte)
+		if !ok {
+			return nil, errors.New("redigo: Int64Map key not a bulk string value")
+		}
+		value, err := Int64(values[i+1], nil)
+		if err != nil {
+			return nil, err
+		}
+		m[string(key)] = value
+	}
+	return m, nil
+}
+
+// Positions is a helper that converts an array of positions (lat, long)
+// into a [][2]float64. The GEOPOS command returns replies in this format.
+func Positions(result interface{}, err error) ([]*[2]float64, error) {
+	values, err := Values(result, err)
+	if err != nil {
+		return nil, err
+	}
+	positions := make([]*[2]float64, len(values))
+	for i := range values {
+		if values[i] == nil {
+			continue
+		}
+		p, ok := values[i].([]interface{})
+		if !ok {
+			return nil, fmt.Errorf("redigo: unexpected element type for interface slice, got type %T", values[i])
+		}
+		if len(p) != 2 {
+			return nil, fmt.Errorf("redigo: unexpected number of values for a member position, got %d", len(p))
+		}
+		lat, err := Float64(p[0], nil)
+		if err != nil {
+			return nil, err
+		}
+		long, err := Float64(p[1], nil)
+		if err != nil {
+			return nil, err
+		}
+		positions[i] = &[2]float64{lat, long}
+	}
+	return positions, nil
+}
@@ -0,0 +1,209 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+type valueError struct {
+	v   interface{}
+	err error
+}
+
+func ve(v interface{}, err error) valueError {
+	return valueError{v, err}
+}
+
+var replyTests = []struct {
+	name     interface{}
+	actual   valueError
+	expected valueError
+}{
+	{
+		"ints([[]byte, []byte])",
+		ve(redis.Ints([]interface{}{[]byte("4"), []byte("5")}, nil)),
+		ve([]int{4, 5}, nil),
+	},
+	{
+		"ints([nt64, int64])",
+		ve(redis.Ints([]interface{}{int64(4), int64(5)}, nil)),
+		ve([]int{4, 5}, nil),
+	},
+	{
+		"ints([[]byte, nil, []byte])",
+		ve(redis.Ints([]interface{}{[]byte("4"), nil, []byte("5")}, nil)),
+		ve([]int{4, 0, 5}, nil),
+	},
+	{
+		"ints(nil)",
+		ve(redis.Ints(nil, nil)),
+		ve([]int(nil), redis.ErrNil),
+	},
+	{
+		"int64s([[]byte, []byte])",
+		ve(redis.Int64s([]interface{}{[]byte("4"), []byte("5")}, nil)),
+		ve([]int64{4, 5}, nil),
+	},
+	{
+		"int64s([int64, int64])",
+		ve(redis.Int64s([]interface{}{int64(4), int64(5)}, nil)),
+		ve([]int64{4, 5}, nil),
+	},
+	{
+		"strings([[]byte, []bytev2])",
+		ve(redis.Strings([]interface{}{[]byte("v1"), []byte("v2")}, nil)),
+		ve([]string{"v1", "v2"}, nil),
+	},
+	{
+		"strings([string, string])",
+		ve(redis.Strings([]interface{}{"v1", "v2"}, nil)),
+		ve([]string{"v1", "v2"}, nil),
+	},
+	{
+		"byteslices([v1, v2])",
+		ve(redis.ByteSlices([]interface{}{[]byte("v1"), []byte("v2")}, nil)),
+		ve([][]byte{[]byte("v1"), []byte("v2")}, nil),
+	},
+	{
+		"float64s([v1, v2])",
+		ve(redis.Float64s([]interface{}{[]byte("1.234"), []byte("5.678")}, nil)),
+		ve([]float64{1.234, 5.678}, nil),
+	},
+	{
+		"values([v1, v2])",
+		ve(redis.Values([]interface{}{[]byte("v1"), []byte("v2")}, nil)),
+		ve([]interface{}{[]byte("v1"), []byte("v2")}, nil),
+	},
+	{
+		"values(nil)",
+		ve(redis.Values(nil, nil)),
+		ve([]interface{}(nil), redis.ErrNil),
+	},
+	{
+		"float64(1.0)",
+		ve(redis.Float64([]byte("1.0"), nil)),
+		ve(float64(1.0), nil),
+	},
+	{
+		"float64(nil)",
+		ve(redis.Float64(nil, nil)),
+		ve(float64(0.0), redis.ErrNil),
+	},
+	{
+		"uint64(1)",
+		ve(redis.Uint64(int64(1), nil)),
+		ve(uint64(1), nil),
+	},
+	{
+		"uint64(-1)",
+		ve(redis.Uint64(int64(-1), nil)),
+		ve(uint64(0), redis.ErrNegativeInt),
+	},
+	{
+		"positions([[1, 2], nil, [3, 4]])",
+		ve(redis.Positions([]interface{}{[]interface{}{[]byte("1"), []byte("2")}, nil, []interface{}{[]byte("3"), []byte("4")}}, nil)),
+		ve([]*[2]float64{{1.0, 2.0}, nil, {3.0, 4.0}}, nil),
+	},
+}
+
+func TestReply(t *testing.T) {
+	for _, rt := range replyTests {
+		if rt.actual.err != rt.expected.err {
+			t.Errorf("%s returned err %v, want %v", rt.name, rt.actual.err, rt.expected.err)
+			continue
+		}
+		if !reflect.DeepEqual(rt.actual.v, rt.expected.v) {
+			t.Errorf("%s=%+v, want %+v", rt.name, rt.actual.v, rt.expected.v)
+		}
+	}
+}
+
+// dial wraps DialDefaultServer() with a more suitable function name for examples.
+func dial() (redis.Conn, error) {
+	return redis.DialDefaultServer()
+}
+
+// serverAddr wraps DefaultServerAddr() with a more suitable function name for examples.
+func serverAddr() (string, error) {
+	return redis.DefaultServerAddr()
+}
+
+func ExampleBool() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Do("SET", "foo", 1)
+	exists, _ := redis.Bool(c.Do("EXISTS", "foo"))
+	fmt.Printf("%#v\n", exists)
+	// Output:
+	// true
+}
+
+func ExampleInt() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Do("SET", "k1", 1)
+	n, _ := redis.Int(c.Do("GET", "k1"))
+	fmt.Printf("%#v\n", n)
+	n, _ = redis.Int(c.Do("INCR", "k1"))
+	fmt.Printf("%#v\n", n)
+	// Output:
+	// 1
+	// 2
+}
+
+func ExampleInts() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Do("SADD", "set_with_integers", 4, 5, 6)
+	ints, _ := redis.Ints(c.Do("SMEMBERS", "set_with_integers"))
+	fmt.Printf("%#v\n", ints)
+	// Output:
+	// []int{4, 5, 6}
+}
+
+func ExampleString() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Do("SET", "hello", "world")
+	s, err := redis.String(c.Do("GET", "hello"))
+	fmt.Printf("%#v\n", s)
+	// Output:
+	// "world"
+}
@@ -0,0 +1,585 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"errors"
+	"fmt"
+	"reflect"
+	"strconv"
+	"strings"
+	"sync"
+)
+
+func ensureLen(d reflect.Value, n int) {
+	if n > d.Cap() {
+		d.Set(reflect.MakeSlice(d.Type(), n, n))
+	} else {
+		d.SetLen(n)
+	}
+}
+
+func cannotConvert(d reflect.Value, s interface{}) error {
+	var sname string
+	switch s.(type) {
+	case string:
+		sname = "Redis simple string"
+	case Error:
+		sname = "Redis error"
+	case int64:
+		sname = "Redis integer"
+	case []byte:
+		sname = "Redis bulk string"
+	case []interface{}:
+		sname = "Redis array"
+	default:
+		sname = reflect.TypeOf(s).String()
+	}
+	return fmt.Errorf("cannot convert from %s to %s", sname, d.Type())
+}
+
+func convertAssignBulkString(d reflect.Value, s []byte) (err error) {
+	switch d.Type().Kind() {
+	case reflect.Float32, reflect.Float64:
+		var x float64
+		x, err = strconv.ParseFloat(string(s), d.Type().Bits())
+		d.SetFloat(x)
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		var x int64
+		x, err = strconv.ParseInt(string(s), 10, d.Type().Bits())
+		d.SetInt(x)
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		var x uint64
+		x, err = strconv.ParseUint(string(s), 10, d.Type().Bits())
+		d.SetUint(x)
+	case reflect.Bool:
+		var x bool
+		x, err = strconv.ParseBool(string(s))
+		d.SetBool(x)
+	case reflect.String:
+		d.SetString(string(s))
+	case reflect.Slice:
+		if d.Type().Elem().Kind() != reflect.Uint8 {
+			err = cannotConvert(d, s)
+		} else {
+			d.SetBytes(s)
+		}
+	default:
+		err = cannotConvert(d, s)
+	}
+	return
+}
+
+func convertAssignInt(d reflect.Value, s int64) (err error) {
+	switch d.Type().Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		d.SetInt(s)
+		if d.Int() != s {
+			err = strconv.ErrRange
+			d.SetInt(0)
+		}
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		if s < 0 {
+			err = strconv.ErrRange
+		} else {
+			x := uint64(s)
+			d.SetUint(x)
+			if d.Uint() != x {
+				err = strconv.ErrRange
+				d.SetUint(0)
+			}
+		}
+	case reflect.Bool:
+		d.SetBool(s != 0)
+	default:
+		err = cannotConvert(d, s)
+	}
+	return
+}
+
+func convertAssignValue(d reflect.Value, s interface{}) (err error) {
+	if d.Kind() != reflect.Ptr {
+		if d.CanAddr() {
+			d2 := d.Addr()
+			if d2.CanInterface() {
+				if scanner, ok := d2.Interface().(Scanner); ok {
+					return scanner.RedisScan(s)
+				}
+			}
+		}
+	} else if d.CanInterface() {
+		// Already a reflect.Ptr
+		if d.IsNil() {
+			d.Set(reflect.New(d.Type().Elem()))
+		}
+		if scanner, ok := d.Interface().(Scanner); ok {
+			return scanner.RedisScan(s)
+		}
+	}
+
+	switch s := s.(type) {
+	case []byte:
+		err = convertAssignBulkString(d, s)
+	case int64:
+		err = convertAssignInt(d, s)
+	default:
+		err = cannotConvert(d, s)
+	}
+	return err
+}
+
+func convertAssignArray(d reflect.Value, s []interface{}) error {
+	if d.Type().Kind() != reflect.Slice {
+		return cannotConvert(d, s)
+	}
+	ensureLen(d, len(s))
+	for i := 0; i < len(s); i++ {
+		if err := convertAssignValue(d.Index(i), s[i]); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func convertAssign(d interface{}, s interface{}) (err error) {
+	if scanner, ok := d.(Scanner); ok {
+		return scanner.RedisScan(s)
+	}
+
+	// Handle the most common destination types using type switches and
+	// fall back to reflection for all other types.
+	switch s := s.(type) {
+	case nil:
+		// ignore
+	case []byte:
+		switch d := d.(type) {
+		case *string:
+			*d = string(s)
+		case *int:
+			*d, err = strconv.Atoi(string(s))
+		case *bool:
+			*d, err = strconv.ParseBool(string(s))
+		case *[]byte:
+			*d = s
+		case *interface{}:
+			*d = s
+		case nil:
+			// skip value
+		default:
+			if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
+				err = cannotConvert(d, s)
+			} else {
+				err = convertAssignBulkString(d.Elem(), s)
+			}
+		}
+	case int64:
+		switch d := d.(type) {
+		case *int:
+			x := int(s)
+			if int64(x) != s {
+				err = strconv.ErrRange
+				x = 0
+			}
+			*d = x
+		case *bool:
+			*d = s != 0
+		case *interface{}:
+			*d = s
+		case nil:
+			// skip value
+		default:
+			if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
+				err = cannotConvert(d, s)
+			} else {
+				err = convertAssignInt(d.Elem(), s)
+			}
+		}
+	case string:
+		switch d := d.(type) {
+		case *string:
+			*d = s
+		case *interface{}:
+			*d = s
+		case nil:
+			// skip value
+		default:
+			err = cannotConvert(reflect.ValueOf(d), s)
+		}
+	case []interface{}:
+		switch d := d.(type) {
+		case *[]interface{}:
+			*d = s
+		case *interface{}:
+			*d = s
+		case nil:
+			// skip value
+		default:
+			if d := reflect.ValueOf(d); d.Type().Kind() != reflect.Ptr {
+				err = cannotConvert(d, s)
+			} else {
+				err = convertAssignArray(d.Elem(), s)
+			}
+		}
+	case Error:
+		err = s
+	default:
+		err = cannotConvert(reflect.ValueOf(d), s)
+	}
+	return
+}
+
+// Scan copies from src to the values pointed at by dest.
+//
+// Scan uses RedisScan if available otherwise:
+//
+// The values pointed at by dest must be an integer, float, boolean, string,
+// []byte, interface{} or slices of these types. Scan uses the standard strconv
+// package to convert bulk strings to numeric and boolean types.
+//
+// If a dest value is nil, then the corresponding src value is skipped.
+//
+// If a src element is nil, then the corresponding dest value is not modified.
+//
+// To enable easy use of Scan in a loop, Scan returns the slice of src
+// following the copied values.
+func Scan(src []interface{}, dest ...interface{}) ([]interface{}, error) {
+	if len(src) < len(dest) {
+		return nil, errors.New("redigo.Scan: array short")
+	}
+	var err error
+	for i, d := range dest {
+		err = convertAssign(d, src[i])
+		if err != nil {
+			err = fmt.Errorf("redigo.Scan: cannot assign to dest %d: %v", i, err)
+			break
+		}
+	}
+	return src[len(dest):], err
+}
+
+type fieldSpec struct {
+	name      string
+	index     []int
+	omitEmpty bool
+}
+
+type structSpec struct {
+	m map[string]*fieldSpec
+	l []*fieldSpec
+}
+
+func (ss *structSpec) fieldSpec(name []byte) *fieldSpec {
+	return ss.m[string(name)]
+}
+
+func compileStructSpec(t reflect.Type, depth map[string]int, index []int, ss *structSpec) {
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		switch {
+		case f.PkgPath != "" && !f.Anonymous:
+			// Ignore unexported fields.
+		case f.Anonymous:
+			// TODO: Handle pointers. Requires change to decoder and
+			// protection against infinite recursion.
+			if f.Type.Kind() == reflect.Struct {
+				compileStructSpec(f.Type, depth, append(index, i), ss)
+			}
+		default:
+			fs := &fieldSpec{name: f.Name}
+			tag := f.Tag.Get("redis")
+			p := strings.Split(tag, ",")
+			if len(p) > 0 {
+				if p[0] == "-" {
+					continue
+				}
+				if len(p[0]) > 0 {
+					fs.name = p[0]
+				}
+				for _, s := range p[1:] {
+					switch s {
+					case "omitempty":
+						fs.omitEmpty = true
+					default:
+						panic(fmt.Errorf("redigo: unknown field tag %s for type %s", s, t.Name()))
+					}
+				}
+			}
+			d, found := depth[fs.name]
+			if !found {
+				d = 1 << 30
+			}
+			switch {
+			case len(index) == d:
+				// At same depth, remove from result.
+				delete(ss.m, fs.name)
+				j := 0
+				for i := 0; i < len(ss.l); i++ {
+					if fs.name != ss.l[i].name {
+						ss.l[j] = ss.l[i]
+						j += 1
+					}
+				}
+				ss.l = ss.l[:j]
+			case len(index) < d:
+				fs.index = make([]int, len(index)+1)
+				copy(fs.index, index)
+				fs.index[len(index)] = i
+				depth[fs.name] = len(index)
+				ss.m[fs.name] = fs
+				ss.l = append(ss.l, fs)
+			}
+		}
+	}
+}
+
+var (
+	structSpecMutex  sync.RWMutex
+	structSpecCache  = make(map[reflect.Type]*structSpec)
+	defaultFieldSpec = &fieldSpec{}
+)
+
+func structSpecForType(t reflect.Type) *structSpec {
+
+	structSpecMutex.RLock()
+	ss, found := structSpecCache[t]
+	structSpecMutex.RUnlock()
+	if found {
+		return ss
+	}
+
+	structSpecMutex.Lock()
+	defer structSpecMutex.Unlock()
+	ss, found = structSpecCache[t]
+	if found {
+		return ss
+	}
+
+	ss = &structSpec{m: make(map[string]*fieldSpec)}
+	compileStructSpec(t, make(map[string]int), nil, ss)
+	structSpecCache[t] = ss
+	return ss
+}
+
+var errScanStructValue = errors.New("redigo.ScanStruct: value must be non-nil pointer to a struct")
+
+// ScanStruct scans alternating names and values from src to a struct. The
+// HGETALL and CONFIG GET commands return replies in this format.
+//
+// ScanStruct uses exported field names to match values in the response. Use
+// 'redis' field tag to override the name:
+//
+//      Field int `redis:"myName"`
+//
+// Fields with the tag redis:"-" are ignored.
+//
+// Each field uses RedisScan if available otherwise:
+// Integer, float, boolean, string and []byte fields are supported. Scan uses the
+// standard strconv package to convert bulk string values to numeric and
+// boolean types.
+//
+// If a src element is nil, then the corresponding field is not modified.
+func ScanStruct(src []interface{}, dest interface{}) error {
+	d := reflect.ValueOf(dest)
+	if d.Kind() != reflect.Ptr || d.IsNil() {
+		return errScanStructValue
+	}
+	d = d.Elem()
+	if d.Kind() != reflect.Struct {
+		return errScanStructValue
+	}
+	ss := structSpecForType(d.Type())
+
+	if len(src)%2 != 0 {
+		return errors.New("redigo.ScanStruct: number of values not a multiple of 2")
+	}
+
+	for i := 0; i < len(src); i += 2 {
+		s := src[i+1]
+		if s == nil {
+			continue
+		}
+		name, ok := src[i].([]byte)
+		if !ok {
+			return fmt.Errorf("redigo.ScanStruct: key %d not a bulk string value", i)
+		}
+		fs := ss.fieldSpec(name)
+		if fs == nil {
+			continue
+		}
+		if err := convertAssignValue(d.FieldByIndex(fs.index), s); err != nil {
+			return fmt.Errorf("redigo.ScanStruct: cannot assign field %s: %v", fs.name, err)
+		}
+	}
+	return nil
+}
+
+var (
+	errScanSliceValue = errors.New("redigo.ScanSlice: dest must be non-nil pointer to a struct")
+)
+
+// ScanSlice scans src to the slice pointed to by dest. The elements the dest
+// slice must be integer, float, boolean, string, struct or pointer to struct
+// values.
+//
+// Struct fields must be integer, float, boolean or string values. All struct
+// fields are used unless a subset is specified using fieldNames.
+func ScanSlice(src []interface{}, dest interface{}, fieldNames ...string) error {
+	d := reflect.ValueOf(dest)
+	if d.Kind() != reflect.Ptr || d.IsNil() {
+		return errScanSliceValue
+	}
+	d = d.Elem()
+	if d.Kind() != reflect.Slice {
+		return errScanSliceValue
+	}
+
+	isPtr := false
+	t := d.Type().Elem()
+	if t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Struct {
+		isPtr = true
+		t = t.Elem()
+	}
+
+	if t.Kind() != reflect.Struct {
+		ensureLen(d, len(src))
+		for i, s := range src {
+			if s == nil {
+				continue
+			}
+			if err := convertAssignValue(d.Index(i), s); err != nil {
+				return fmt.Errorf("redigo.ScanSlice: cannot assign element %d: %v", i, err)
+			}
+		}
+		return nil
+	}
+
+	ss := structSpecForType(t)
+	fss := ss.l
+	if len(fieldNames) > 0 {
+		fss = make([]*fieldSpec, len(fieldNames))
+		for i, name := range fieldNames {
+			fss[i] = ss.m[name]
+			if fss[i] == nil {
+				return fmt.Errorf("redigo.ScanSlice: ScanSlice bad field name %s", name)
+			}
+		}
+	}
+
+	if len(fss) == 0 {
+		return errors.New("redigo.ScanSlice: no struct fields")
+	}
+
+	n := len(src) / len(fss)
+	if n*len(fss) != len(src) {
+		return errors.New("redigo.ScanSlice: length not a multiple of struct field count")
+	}
+
+	ensureLen(d, n)
+	for i := 0; i < n; i++ {
+		d := d.Index(i)
+		if isPtr {
+			if d.IsNil() {
+				d.Set(reflect.New(t))
+			}
+			d = d.Elem()
+		}
+		for j, fs := range fss {
+			s := src[i*len(fss)+j]
+			if s == nil {
+				continue
+			}
+			if err := convertAssignValue(d.FieldByIndex(fs.index), s); err != nil {
+				return fmt.Errorf("redigo.ScanSlice: cannot assign element %d to field %s: %v", i*len(fss)+j, fs.name, err)
+			}
+		}
+	}
+	return nil
+}
+
+// Args is a helper for constructing command arguments from structured values.
+type Args []interface{}
+
+// Add returns the result of appending value to args.
+func (args Args) Add(value ...interface{}) Args {
+	return append(args, value...)
+}
+
+// AddFlat returns the result of appending the flattened value of v to args.
+//
+// Maps are flattened by appending the alternating keys and map values to args.
+//
+// Slices are flattened by appending the slice elements to args.
+//
+// Structs are flattened by appending the alternating names and values of
+// exported fields to args. If v is a nil struct pointer, then nothing is
+// appended. The 'redis' field tag overrides struct field names. See ScanStruct
+// for more information on the use of the 'redis' field tag.
+//
+// Other types are appended to args as is.
+func (args Args) AddFlat(v interface{}) Args {
+	rv := reflect.ValueOf(v)
+	switch rv.Kind() {
+	case reflect.Struct:
+		args = flattenStruct(args, rv)
+	case reflect.Slice:
+		for i := 0; i < rv.Len(); i++ {
+			args = append(args, rv.Index(i).Interface())
+		}
+	case reflect.Map:
+		for _, k := range rv.MapKeys() {
+			args = append(args, k.Interface(), rv.MapIndex(k).Interface())
+		}
+	case reflect.Ptr:
+		if rv.Type().Elem().Kind() == reflect.Struct {
+			if !rv.IsNil() {
+				args = flattenStruct(args, rv.Elem())
+			}
+		} else {
+			args = append(args, v)
+		}
+	default:
+		args = append(args, v)
+	}
+	return args
+}
+
+func flattenStruct(args Args, v reflect.Value) Args {
+	ss := structSpecForType(v.Type())
+	for _, fs := range ss.l {
+		fv := v.FieldByIndex(fs.index)
+		if fs.omitEmpty {
+			var empty = false
+			switch fv.Kind() {
+			case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
+				empty = fv.Len() == 0
+			case reflect.Bool:
+				empty = !fv.Bool()
+			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+				empty = fv.Int() == 0
+			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				empty = fv.Uint() == 0
+			case reflect.Float32, reflect.Float64:
+				empty = fv.Float() == 0
+			case reflect.Interface, reflect.Ptr:
+				empty = fv.IsNil()
+			}
+			if empty {
+				continue
+			}
+		}
+		args = append(args, fs.name, fv.Interface())
+	}
+	return args
+}
@@ -0,0 +1,494 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"fmt"
+	"math"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+type durationScan struct {
+	time.Duration `redis:"sd"`
+}
+
+func (t *durationScan) RedisScan(src interface{}) (err error) {
+	if t == nil {
+		return fmt.Errorf("nil pointer")
+	}
+	switch src := src.(type) {
+	case string:
+		t.Duration, err = time.ParseDuration(src)
+	case []byte:
+		t.Duration, err = time.ParseDuration(string(src))
+	case int64:
+		t.Duration = time.Duration(src)
+	default:
+		err = fmt.Errorf("cannot convert from %T to %T", src, t)
+	}
+	return err
+}
+
+var scanConversionTests = []struct {
+	src  interface{}
+	dest interface{}
+}{
+	{[]byte("-inf"), math.Inf(-1)},
+	{[]byte("+inf"), math.Inf(1)},
+	{[]byte("0"), float64(0)},
+	{[]byte("3.14159"), float64(3.14159)},
+	{[]byte("3.14"), float32(3.14)},
+	{[]byte("-100"), int(-100)},
+	{[]byte("101"), int(101)},
+	{int64(102), int(102)},
+	{[]byte("103"), uint(103)},
+	{int64(104), uint(104)},
+	{[]byte("105"), int8(105)},
+	{int64(106), int8(106)},
+	{[]byte("107"), uint8(107)},
+	{int64(108), uint8(108)},
+	{[]byte("0"), false},
+	{int64(0), false},
+	{[]byte("f"), false},
+	{[]byte("1"), true},
+	{int64(1), true},
+	{[]byte("t"), true},
+	{"hello", "hello"},
+	{[]byte("hello"), "hello"},
+	{[]byte("world"), []byte("world")},
+	{[]interface{}{[]byte("foo")}, []interface{}{[]byte("foo")}},
+	{[]interface{}{[]byte("foo")}, []string{"foo"}},
+	{[]interface{}{[]byte("hello"), []byte("world")}, []string{"hello", "world"}},
+	{[]interface{}{[]byte("bar")}, [][]byte{[]byte("bar")}},
+	{[]interface{}{[]byte("1")}, []int{1}},
+	{[]interface{}{[]byte("1"), []byte("2")}, []int{1, 2}},
+	{[]interface{}{[]byte("1"), []byte("2")}, []float64{1, 2}},
+	{[]interface{}{[]byte("1")}, []byte{1}},
+	{[]interface{}{[]byte("1")}, []bool{true}},
+	{"1m", durationScan{Duration: time.Minute}},
+	{[]byte("1m"), durationScan{Duration: time.Minute}},
+	{time.Minute.Nanoseconds(), durationScan{Duration: time.Minute}},
+	{[]interface{}{[]byte("1m")}, []durationScan{durationScan{Duration: time.Minute}}},
+	{[]interface{}{[]byte("1m")}, []*durationScan{&durationScan{Duration: time.Minute}}},
+}
+
+func TestScanConversion(t *testing.T) {
+	for _, tt := range scanConversionTests {
+		values := []interface{}{tt.src}
+		dest := reflect.New(reflect.TypeOf(tt.dest))
+		values, err := redis.Scan(values, dest.Interface())
+		if err != nil {
+			t.Errorf("Scan(%v) returned error %v", tt, err)
+			continue
+		}
+		if !reflect.DeepEqual(tt.dest, dest.Elem().Interface()) {
+			t.Errorf("Scan(%v) returned %v, want %v", tt, dest.Elem().Interface(), tt.dest)
+		}
+	}
+}
+
+var scanConversionErrorTests = []struct {
+	src  interface{}
+	dest interface{}
+}{
+	{[]byte("1234"), byte(0)},
+	{int64(1234), byte(0)},
+	{[]byte("-1"), byte(0)},
+	{int64(-1), byte(0)},
+	{[]byte("junk"), false},
+	{redis.Error("blah"), false},
+	{redis.Error("blah"), durationScan{Duration: time.Minute}},
+	{"invalid", durationScan{Duration: time.Minute}},
+}
+
+func TestScanConversionError(t *testing.T) {
+	for _, tt := range scanConversionErrorTests {
+		values := []interface{}{tt.src}
+		dest := reflect.New(reflect.TypeOf(tt.dest))
+		values, err := redis.Scan(values, dest.Interface())
+		if err == nil {
+			t.Errorf("Scan(%v) did not return error", tt)
+		}
+	}
+}
+
+func ExampleScan() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Send("HMSET", "album:1", "title", "Red", "rating", 5)
+	c.Send("HMSET", "album:2", "title", "Earthbound", "rating", 1)
+	c.Send("HMSET", "album:3", "title", "Beat")
+	c.Send("LPUSH", "albums", "1")
+	c.Send("LPUSH", "albums", "2")
+	c.Send("LPUSH", "albums", "3")
+	values, err := redis.Values(c.Do("SORT", "albums",
+		"BY", "album:*->rating",
+		"GET", "album:*->title",
+		"GET", "album:*->rating"))
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	for len(values) > 0 {
+		var title string
+		rating := -1 // initialize to illegal value to detect nil.
+		values, err = redis.Scan(values, &title, &rating)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		if rating == -1 {
+			fmt.Println(title, "not-rated")
+		} else {
+			fmt.Println(title, rating)
+		}
+	}
+	// Output:
+	// Beat not-rated
+	// Earthbound 1
+	// Red 5
+}
+
+type s0 struct {
+	X  int
+	Y  int `redis:"y"`
+	Bt bool
+}
+
+type s1 struct {
+	X  int    `redis:"-"`
+	I  int    `redis:"i"`
+	U  uint   `redis:"u"`
+	S  string `redis:"s"`
+	P  []byte `redis:"p"`
+	B  bool   `redis:"b"`
+	Bt bool
+	Bf bool
+	s0
+	Sd  durationScan  `redis:"sd"`
+	Sdp *durationScan `redis:"sdp"`
+}
+
+var scanStructTests = []struct {
+	title string
+	reply []string
+	value interface{}
+}{
+	{"basic",
+		[]string{
+			"i", "-1234",
+			"u", "5678",
+			"s", "hello",
+			"p", "world",
+			"b", "t",
+			"Bt", "1",
+			"Bf", "0",
+			"X", "123",
+			"y", "456",
+			"sd", "1m",
+			"sdp", "1m",
+		},
+		&s1{
+			I:   -1234,
+			U:   5678,
+			S:   "hello",
+			P:   []byte("world"),
+			B:   true,
+			Bt:  true,
+			Bf:  false,
+			s0:  s0{X: 123, Y: 456},
+			Sd:  durationScan{Duration: time.Minute},
+			Sdp: &durationScan{Duration: time.Minute},
+		},
+	},
+}
+
+func TestScanStruct(t *testing.T) {
+	for _, tt := range scanStructTests {
+
+		var reply []interface{}
+		for _, v := range tt.reply {
+			reply = append(reply, []byte(v))
+		}
+
+		value := reflect.New(reflect.ValueOf(tt.value).Type().Elem())
+
+		if err := redis.ScanStruct(reply, value.Interface()); err != nil {
+			t.Fatalf("ScanStruct(%s) returned error %v", tt.title, err)
+		}
+
+		if !reflect.DeepEqual(value.Interface(), tt.value) {
+			t.Fatalf("ScanStruct(%s) returned %v, want %v", tt.title, value.Interface(), tt.value)
+		}
+	}
+}
+
+func TestBadScanStructArgs(t *testing.T) {
+	x := []interface{}{"A", "b"}
+	test := func(v interface{}) {
+		if err := redis.ScanStruct(x, v); err == nil {
+			t.Errorf("Expect error for ScanStruct(%T, %T)", x, v)
+		}
+	}
+
+	test(nil)
+
+	var v0 *struct{}
+	test(v0)
+
+	var v1 int
+	test(&v1)
+
+	x = x[:1]
+	v2 := struct{ A string }{}
+	test(&v2)
+}
+
+var scanSliceTests = []struct {
+	src        []interface{}
+	fieldNames []string
+	ok         bool
+	dest       interface{}
+}{
+	{
+		[]interface{}{[]byte("1"), nil, []byte("-1")},
+		nil,
+		true,
+		[]int{1, 0, -1},
+	},
+	{
+		[]interface{}{[]byte("1"), nil, []byte("2")},
+		nil,
+		true,
+		[]uint{1, 0, 2},
+	},
+	{
+		[]interface{}{[]byte("-1")},
+		nil,
+		false,
+		[]uint{1},
+	},
+	{
+		[]interface{}{[]byte("hello"), nil, []byte("world")},
+		nil,
+		true,
+		[][]byte{[]byte("hello"), nil, []byte("world")},
+	},
+	{
+		[]interface{}{[]byte("hello"), nil, []byte("world")},
+		nil,
+		true,
+		[]string{"hello", "", "world"},
+	},
+	{
+		[]interface{}{[]byte("a1"), []byte("b1"), []byte("a2"), []byte("b2")},
+		nil,
+		true,
+		[]struct{ A, B string }{{"a1", "b1"}, {"a2", "b2"}},
+	},
+	{
+		[]interface{}{[]byte("a1"), []byte("b1")},
+		nil,
+		false,
+		[]struct{ A, B, C string }{{"a1", "b1", ""}},
+	},
+	{
+		[]interface{}{[]byte("a1"), []byte("b1"), []byte("a2"), []byte("b2")},
+		nil,
+		true,
+		[]*struct{ A, B string }{{"a1", "b1"}, {"a2", "b2"}},
+	},
+	{
+		[]interface{}{[]byte("a1"), []byte("b1"), []byte("a2"), []byte("b2")},
+		[]string{"A", "B"},
+		true,
+		[]struct{ A, C, B string }{{"a1", "", "b1"}, {"a2", "", "b2"}},
+	},
+	{
+		[]interface{}{[]byte("a1"), []byte("b1"), []byte("a2"), []byte("b2")},
+		nil,
+		false,
+		[]struct{}{},
+	},
+}
+
+func TestScanSlice(t *testing.T) {
+	for _, tt := range scanSliceTests {
+
+		typ := reflect.ValueOf(tt.dest).Type()
+		dest := reflect.New(typ)
+
+		err := redis.ScanSlice(tt.src, dest.Interface(), tt.fieldNames...)
+		if tt.ok != (err == nil) {
+			t.Errorf("ScanSlice(%v, []%s, %v) returned error %v", tt.src, typ, tt.fieldNames, err)
+			continue
+		}
+		if tt.ok && !reflect.DeepEqual(dest.Elem().Interface(), tt.dest) {
+			t.Errorf("ScanSlice(src, []%s) returned %#v, want %#v", typ, dest.Elem().Interface(), tt.dest)
+		}
+	}
+}
+
+func ExampleScanSlice() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	c.Send("HMSET", "album:1", "title", "Red", "rating", 5)
+	c.Send("HMSET", "album:2", "title", "Earthbound", "rating", 1)
+	c.Send("HMSET", "album:3", "title", "Beat", "rating", 4)
+	c.Send("LPUSH", "albums", "1")
+	c.Send("LPUSH", "albums", "2")
+	c.Send("LPUSH", "albums", "3")
+	values, err := redis.Values(c.Do("SORT", "albums",
+		"BY", "album:*->rating",
+		"GET", "album:*->title",
+		"GET", "album:*->rating"))
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	var albums []struct {
+		Title  string
+		Rating int
+	}
+	if err := redis.ScanSlice(values, &albums); err != nil {
+		fmt.Println(err)
+		return
+	}
+	fmt.Printf("%v\n", albums)
+	// Output:
+	// [{Earthbound 1} {Beat 4} {Red 5}]
+}
+
+var argsTests = []struct {
+	title    string
+	actual   redis.Args
+	expected redis.Args
+}{
+	{"struct ptr",
+		redis.Args{}.AddFlat(&struct {
+			I  int               `redis:"i"`
+			U  uint              `redis:"u"`
+			S  string            `redis:"s"`
+			P  []byte            `redis:"p"`
+			M  map[string]string `redis:"m"`
+			Bt bool
+			Bf bool
+		}{
+			-1234, 5678, "hello", []byte("world"), map[string]string{"hello": "world"}, true, false,
+		}),
+		redis.Args{"i", int(-1234), "u", uint(5678), "s", "hello", "p", []byte("world"), "m", map[string]string{"hello": "world"}, "Bt", true, "Bf", false},
+	},
+	{"struct",
+		redis.Args{}.AddFlat(struct{ I int }{123}),
+		redis.Args{"I", 123},
+	},
+	{"slice",
+		redis.Args{}.Add(1).AddFlat([]string{"a", "b", "c"}).Add(2),
+		redis.Args{1, "a", "b", "c", 2},
+	},
+	{"struct omitempty",
+		redis.Args{}.AddFlat(&struct {
+			I  int               `redis:"i,omitempty"`
+			U  uint              `redis:"u,omitempty"`
+			S  string            `redis:"s,omitempty"`
+			P  []byte            `redis:"p,omitempty"`
+			M  map[string]string `redis:"m,omitempty"`
+			Bt bool              `redis:"Bt,omitempty"`
+			Bf bool              `redis:"Bf,omitempty"`
+		}{
+			0, 0, "", []byte{}, map[string]string{}, true, false,
+		}),
+		redis.Args{"Bt", true},
+	},
+}
+
+func TestArgs(t *testing.T) {
+	for _, tt := range argsTests {
+		if !reflect.DeepEqual(tt.actual, tt.expected) {
+			t.Fatalf("%s is %v, want %v", tt.title, tt.actual, tt.expected)
+		}
+	}
+}
+
+func ExampleArgs() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	var p1, p2 struct {
+		Title  string `redis:"title"`
+		Author string `redis:"author"`
+		Body   string `redis:"body"`
+	}
+
+	p1.Title = "Example"
+	p1.Author = "Gary"
+	p1.Body = "Hello"
+
+	if _, err := c.Do("HMSET", redis.Args{}.Add("id1").AddFlat(&p1)...); err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	m := map[string]string{
+		"title":  "Example2",
+		"author": "Steve",
+		"body":   "Map",
+	}
+
+	if _, err := c.Do("HMSET", redis.Args{}.Add("id2").AddFlat(m)...); err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	for _, id := range []string{"id1", "id2"} {
+
+		v, err := redis.Values(c.Do("HGETALL", id))
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		if err := redis.ScanStruct(v, &p2); err != nil {
+			fmt.Println(err)
+			return
+		}
+
+		fmt.Printf("%+v\n", p2)
+	}
+
+	// Output:
+	// {Title:Example Author:Gary Body:Hello}
+	// {Title:Example2 Author:Steve Body:Map}
+}
@@ -0,0 +1,91 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"crypto/sha1"
+	"encoding/hex"
+	"io"
+	"strings"
+)
+
+// Script encapsulates the source, hash and key count for a Lua script. See
+// http://redis.io/commands/eval for information on scripts in Redis.
+type Script struct {
+	keyCount int
+	src      string
+	hash     string
+}
+
+// NewScript returns a new script object. If keyCount is greater than or equal
+// to zero, then the count is automatically inserted in the EVAL command
+// argument list. If keyCount is less than zero, then the application supplies
+// the count as the first value in the keysAndArgs argument to the Do, Send and
+// SendHash methods.
+func NewScript(keyCount int, src string) *Script {
+	h := sha1.New()
+	io.WriteString(h, src)
+	return &Script{keyCount, src, hex.EncodeToString(h.Sum(nil))}
+}
+
+func (s *Script) args(spec string, keysAndArgs []interface{}) []interface{} {
+	var args []interface{}
+	if s.keyCount < 0 {
+		args = make([]interface{}, 1+len(keysAndArgs))
+		args[0] = spec
+		copy(args[1:], keysAndArgs)
+	} else {
+		args = make([]interface{}, 2+len(keysAndArgs))
+		args[0] = spec
+		args[1] = s.keyCount
+		copy(args[2:], keysAndArgs)
+	}
+	return args
+}
+
+// Hash returns the script hash.
+func (s *Script) Hash() string {
+	return s.hash
+}
+
+// Do evaluates the script. Under the covers, Do optimistically evaluates the
+// script using the EVALSHA command. If the command fails because the script is
+// not loaded, then Do evaluates the script using the EVAL command (thus
+// causing the script to load).
+func (s *Script) Do(c Conn, keysAndArgs ...interface{}) (interface{}, error) {
+	v, err := c.Do("EVALSHA", s.args(s.hash, keysAndArgs)...)
+	if e, ok := err.(Error); ok && strings.HasPrefix(string(e), "NOSCRIPT ") {
+		v, err = c.Do("EVAL", s.args(s.src, keysAndArgs)...)
+	}
+	return v, err
+}
+
+// SendHash evaluates the script without waiting for the reply. The script is
+// evaluated with the EVALSHA command. The application must ensure that the
+// script is loaded by a previous call to Send, Do or Load methods.
+func (s *Script) SendHash(c Conn, keysAndArgs ...interface{}) error {
+	return c.Send("EVALSHA", s.args(s.hash, keysAndArgs)...)
+}
+
+// Send evaluates the script without waiting for the reply.
+func (s *Script) Send(c Conn, keysAndArgs ...interface{}) error {
+	return c.Send("EVAL", s.args(s.src, keysAndArgs)...)
+}
+
+// Load loads the script without evaluating it.
+func (s *Script) Load(c Conn) error {
+	_, err := c.Do("SCRIPT", "LOAD", s.src)
+	return err
+}
@@ -0,0 +1,100 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"fmt"
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+var (
+	// These variables are declared at package level to remove distracting
+	// details from the examples.
+	c     redis.Conn
+	reply interface{}
+	err   error
+)
+
+func ExampleScript() {
+	// Initialize a package-level variable with a script.
+	var getScript = redis.NewScript(1, `return redis.call('get', KEYS[1])`)
+
+	// In a function, use the script Do method to evaluate the script. The Do
+	// method optimistically uses the EVALSHA command. If the script is not
+	// loaded, then the Do method falls back to the EVAL command.
+	reply, err = getScript.Do(c, "foo")
+}
+
+func TestScript(t *testing.T) {
+	c, err := redis.DialDefaultServer()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	// To test fall back in Do, we make script unique by adding comment with current time.
+	script := fmt.Sprintf("--%d\nreturn {KEYS[1],KEYS[2],ARGV[1],ARGV[2]}", time.Now().UnixNano())
+	s := redis.NewScript(2, script)
+	reply := []interface{}{[]byte("key1"), []byte("key2"), []byte("arg1"), []byte("arg2")}
+
+	v, err := s.Do(c, "key1", "key2", "arg1", "arg2")
+	if err != nil {
+		t.Errorf("s.Do(c, ...) returned %v", err)
+	}
+
+	if !reflect.DeepEqual(v, reply) {
+		t.Errorf("s.Do(c, ..); = %v, want %v", v, reply)
+	}
+
+	err = s.Load(c)
+	if err != nil {
+		t.Errorf("s.Load(c) returned %v", err)
+	}
+
+	err = s.SendHash(c, "key1", "key2", "arg1", "arg2")
+	if err != nil {
+		t.Errorf("s.SendHash(c, ...) returned %v", err)
+	}
+
+	err = c.Flush()
+	if err != nil {
+		t.Errorf("c.Flush() returned %v", err)
+	}
+
+	v, err = c.Receive()
+	if !reflect.DeepEqual(v, reply) {
+		t.Errorf("s.SendHash(c, ..); c.Receive() = %v, want %v", v, reply)
+	}
+
+	err = s.Send(c, "key1", "key2", "arg1", "arg2")
+	if err != nil {
+		t.Errorf("s.Send(c, ...) returned %v", err)
+	}
+
+	err = c.Flush()
+	if err != nil {
+		t.Errorf("c.Flush() returned %v", err)
+	}
+
+	v, err = c.Receive()
+	if !reflect.DeepEqual(v, reply) {
+		t.Errorf("s.Send(c, ..); c.Receive() = %v, want %v", v, reply)
+	}
+
+}
@@ -0,0 +1,183 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis
+
+import (
+	"bufio"
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strconv"
+	"strings"
+	"sync"
+	"testing"
+	"time"
+)
+
+func SetNowFunc(f func() time.Time) {
+	nowFunc = f
+}
+
+var (
+	ErrNegativeInt = errNegativeInt
+
+	serverPath     = flag.String("redis-server", "redis-server", "Path to redis server binary")
+	serverAddress  = flag.String("redis-address", "127.0.0.1", "The address of the server")
+	serverBasePort = flag.Int("redis-port", 16379, "Beginning of port range for test servers")
+	serverLogName  = flag.String("redis-log", "", "Write Redis server logs to `filename`")
+	serverLog      = ioutil.Discard
+
+	defaultServerMu  sync.Mutex
+	defaultServer    *Server
+	defaultServerErr error
+)
+
+type Server struct {
+	name string
+	cmd  *exec.Cmd
+	done chan struct{}
+}
+
+func NewServer(name string, args ...string) (*Server, error) {
+	s := &Server{
+		name: name,
+		cmd:  exec.Command(*serverPath, args...),
+		done: make(chan struct{}),
+	}
+
+	r, err := s.cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+
+	err = s.cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	ready := make(chan error, 1)
+	go s.watch(r, ready)
+
+	select {
+	case err = <-ready:
+	case <-time.After(time.Second * 10):
+		err = errors.New("timeout waiting for server to start")
+	}
+
+	if err != nil {
+		s.Stop()
+		return nil, err
+	}
+
+	return s, nil
+}
+
+func (s *Server) watch(r io.Reader, ready chan error) {
+	fmt.Fprintf(serverLog, "%d START %s \n", s.cmd.Process.Pid, s.name)
+	var listening bool
+	var text string
+	scn := bufio.NewScanner(r)
+	for scn.Scan() {
+		text = scn.Text()
+		fmt.Fprintf(serverLog, "%s\n", text)
+		if !listening {
+			if strings.Contains(text, " * Ready to accept connections") ||
+				strings.Contains(text, " * The server is now ready to accept connections on port") {
+				listening = true
+				ready <- nil
+			}
+		}
+	}
+	if !listening {
+		ready <- fmt.Errorf("server exited: %s", text)
+	}
+	s.cmd.Wait()
+	fmt.Fprintf(serverLog, "%d STOP %s \n", s.cmd.Process.Pid, s.name)
+	close(s.done)
+}
+
+func (s *Server) Stop() {
+	s.cmd.Process.Signal(os.Interrupt)
+	<-s.done
+}
+
+// stopDefaultServer stops the server created by DialDefaultServer.
+func stopDefaultServer() {
+	defaultServerMu.Lock()
+	defer defaultServerMu.Unlock()
+	if defaultServer != nil {
+		defaultServer.Stop()
+		defaultServer = nil
+	}
+}
+
+// DefaultServerAddr starts the test server if not already started and returns
+// the address of that server.
+func DefaultServerAddr() (string, error) {
+	defaultServerMu.Lock()
+	defer defaultServerMu.Unlock()
+	addr := fmt.Sprintf("%v:%d", *serverAddress, *serverBasePort)
+	if defaultServer != nil || defaultServerErr != nil {
+		return addr, defaultServerErr
+	}
+	defaultServer, defaultServerErr = NewServer(
+		"default",
+		"--port", strconv.Itoa(*serverBasePort),
+		"--bind", *serverAddress,
+		"--save", "",
+		"--appendonly", "no")
+	return addr, defaultServerErr
+}
+
+// DialDefaultServer starts the test server if not already started and dials a
+// connection to the server.
+func DialDefaultServer() (Conn, error) {
+	addr, err := DefaultServerAddr()
+	if err != nil {
+		return nil, err
+	}
+	c, err := Dial("tcp", addr, DialReadTimeout(1*time.Second), DialWriteTimeout(1*time.Second))
+	if err != nil {
+		return nil, err
+	}
+	c.Do("FLUSHDB")
+	return c, nil
+}
+
+func TestMain(m *testing.M) {
+	os.Exit(func() int {
+		flag.Parse()
+
+		var f *os.File
+		if *serverLogName != "" {
+			var err error
+			f, err = os.OpenFile(*serverLogName, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0600)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "Error opening redis-log: %v\n", err)
+				return 1
+			}
+			defer f.Close()
+			serverLog = f
+		}
+
+		defer stopDefaultServer()
+
+		return m.Run()
+	}())
+}
@@ -0,0 +1,114 @@
+// Copyright 2013 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redis_test
+
+import (
+	"fmt"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+// zpop pops a value from the ZSET key using WATCH/MULTI/EXEC commands.
+func zpop(c redis.Conn, key string) (result string, err error) {
+
+	defer func() {
+		// Return connection to normal state on error.
+		if err != nil {
+			c.Do("DISCARD")
+		}
+	}()
+
+	// Loop until transaction is successful.
+	for {
+		if _, err := c.Do("WATCH", key); err != nil {
+			return "", err
+		}
+
+		members, err := redis.Strings(c.Do("ZRANGE", key, 0, 0))
+		if err != nil {
+			return "", err
+		}
+		if len(members) != 1 {
+			return "", redis.ErrNil
+		}
+
+		c.Send("MULTI")
+		c.Send("ZREM", key, members[0])
+		queued, err := c.Do("EXEC")
+		if err != nil {
+			return "", err
+		}
+
+		if queued != nil {
+			result = members[0]
+			break
+		}
+	}
+
+	return result, nil
+}
+
+// zpopScript pops a value from a ZSET.
+var zpopScript = redis.NewScript(1, `
+    local r = redis.call('ZRANGE', KEYS[1], 0, 0)
+    if r ~= nil then
+        r = r[1]
+        redis.call('ZREM', KEYS[1], r)
+    end
+    return r
+`)
+
+// This example implements ZPOP as described at
+// http://redis.io/topics/transactions using WATCH/MULTI/EXEC and scripting.
+func Example_zpop() {
+	c, err := dial()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	defer c.Close()
+
+	// Add test data using a pipeline.
+
+	for i, member := range []string{"red", "blue", "green"} {
+		c.Send("ZADD", "zset", i, member)
+	}
+	if _, err := c.Do(""); err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	// Pop using WATCH/MULTI/EXEC
+
+	v, err := zpop(c, "zset")
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	fmt.Println(v)
+
+	// Pop using a script.
+
+	v, err = redis.String(zpopScript.Do(c, "zset"))
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	fmt.Println(v)
+
+	// Output:
+	// red
+	// blue
+}
@@ -0,0 +1,152 @@
+// Copyright 2014 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redisx
+
+import (
+	"errors"
+	"sync"
+
+	"github.com/garyburd/redigo/internal"
+	"github.com/garyburd/redigo/redis"
+)
+
+// ConnMux multiplexes one or more connections to a single underlying
+// connection. The ConnMux connections do not support concurrency, commands
+// that associate server side state with the connection or commands that put
+// the connection in a special mode.
+type ConnMux struct {
+	c redis.Conn
+
+	sendMu sync.Mutex
+	sendID uint
+
+	recvMu   sync.Mutex
+	recvID   uint
+	recvWait map[uint]chan struct{}
+}
+
+func NewConnMux(c redis.Conn) *ConnMux {
+	return &ConnMux{c: c, recvWait: make(map[uint]chan struct{})}
+}
+
+// Get gets a connection. The application must close the returned connection.
+func (p *ConnMux) Get() redis.Conn {
+	c := &muxConn{p: p}
+	c.ids = c.buf[:0]
+	return c
+}
+
+// Close closes the underlying connection.
+func (p *ConnMux) Close() error {
+	return p.c.Close()
+}
+
+type muxConn struct {
+	p   *ConnMux
+	ids []uint
+	buf [8]uint
+}
+
+func (c *muxConn) send(flush bool, cmd string, args ...interface{}) error {
+	if internal.LookupCommandInfo(cmd).Set != 0 {
+		return errors.New("command not supported by mux pool")
+	}
+	p := c.p
+	p.sendMu.Lock()
+	id := p.sendID
+	c.ids = append(c.ids, id)
+	p.sendID++
+	err := p.c.Send(cmd, args...)
+	if flush {
+		err = p.c.Flush()
+	}
+	p.sendMu.Unlock()
+	return err
+}
+
+func (c *muxConn) Send(cmd string, args ...interface{}) error {
+	return c.send(false, cmd, args...)
+}
+
+func (c *muxConn) Flush() error {
+	p := c.p
+	p.sendMu.Lock()
+	err := p.c.Flush()
+	p.sendMu.Unlock()
+	return err
+}
+
+func (c *muxConn) Receive() (interface{}, error) {
+	if len(c.ids) == 0 {
+		return nil, errors.New("mux pool underflow")
+	}
+
+	id := c.ids[0]
+	c.ids = c.ids[1:]
+	if len(c.ids) == 0 {
+		c.ids = c.buf[:0]
+	}
+
+	p := c.p
+	p.recvMu.Lock()
+	if p.recvID != id {
+		ch := make(chan struct{})
+		p.recvWait[id] = ch
+		p.recvMu.Unlock()
+		<-ch
+		p.recvMu.Lock()
+		if p.recvID != id {
+			panic("out of sync")
+		}
+	}
+
+	v, err := p.c.Receive()
+
+	id++
+	p.recvID = id
+	ch, ok := p.recvWait[id]
+	if ok {
+		delete(p.recvWait, id)
+	}
+	p.recvMu.Unlock()
+	if ok {
+		ch <- struct{}{}
+	}
+
+	return v, err
+}
+
+func (c *muxConn) Close() error {
+	var err error
+	if len(c.ids) == 0 {
+		return nil
+	}
+	c.Flush()
+	for _ = range c.ids {
+		_, err = c.Receive()
+	}
+	return err
+}
+
+func (c *muxConn) Do(cmd string, args ...interface{}) (interface{}, error) {
+	if err := c.send(true, cmd, args...); err != nil {
+		return nil, err
+	}
+	return c.Receive()
+}
+
+func (c *muxConn) Err() error {
+	return c.p.c.Err()
+}
@@ -0,0 +1,259 @@
+// Copyright 2014 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+package redisx_test
+
+import (
+	"net/textproto"
+	"sync"
+	"testing"
+
+	"github.com/garyburd/redigo/internal/redistest"
+	"github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redisx"
+)
+
+func TestConnMux(t *testing.T) {
+	c, err := redistest.Dial()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	m := redisx.NewConnMux(c)
+	defer m.Close()
+
+	c1 := m.Get()
+	c2 := m.Get()
+	c1.Send("ECHO", "hello")
+	c2.Send("ECHO", "world")
+	c1.Flush()
+	c2.Flush()
+	s, err := redis.String(c1.Receive())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s != "hello" {
+		t.Fatalf("echo returned %q, want %q", s, "hello")
+	}
+	s, err = redis.String(c2.Receive())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s != "world" {
+		t.Fatalf("echo returned %q, want %q", s, "world")
+	}
+	c1.Close()
+	c2.Close()
+}
+
+func TestConnMuxClose(t *testing.T) {
+	c, err := redistest.Dial()
+	if err != nil {
+		t.Fatalf("error connection to database, %v", err)
+	}
+	m := redisx.NewConnMux(c)
+	defer m.Close()
+
+	c1 := m.Get()
+	c2 := m.Get()
+
+	if err := c1.Send("ECHO", "hello"); err != nil {
+		t.Fatal(err)
+	}
+	if err := c1.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := c2.Send("ECHO", "world"); err != nil {
+		t.Fatal(err)
+	}
+	if err := c2.Flush(); err != nil {
+		t.Fatal(err)
+	}
+
+	s, err := redis.String(c2.Receive())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if s != "world" {
+		t.Fatalf("echo returned %q, want %q", s, "world")
+	}
+	c2.Close()
+}
+
+func BenchmarkConn(b *testing.B) {
+	b.StopTimer()
+	c, err := redistest.Dial()
+	if err != nil {
+		b.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		if _, err := c.Do("PING"); err != nil {
+			b.Fatal(err)
+		}
+	}
+}
+
+func BenchmarkConnMux(b *testing.B) {
+	b.StopTimer()
+	c, err := redistest.Dial()
+	if err != nil {
+		b.Fatalf("error connection to database, %v", err)
+	}
+	m := redisx.NewConnMux(c)
+	defer m.Close()
+
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		c := m.Get()
+		if _, err := c.Do("PING"); err != nil {
+			b.Fatal(err)
+		}
+		c.Close()
+	}
+}
+
+func BenchmarkPool(b *testing.B) {
+	b.StopTimer()
+
+	p := redis.Pool{Dial: redistest.Dial, MaxIdle: 1}
+	defer p.Close()
+
+	// Fill the pool.
+	c := p.Get()
+	if err := c.Err(); err != nil {
+		b.Fatal(err)
+	}
+	c.Close()
+
+	b.StartTimer()
+
+	for i := 0; i < b.N; i++ {
+		c := p.Get()
+		if _, err := c.Do("PING"); err != nil {
+			b.Fatal(err)
+		}
+		c.Close()
+	}
+}
+
+const numConcurrent = 10
+
+func BenchmarkConnMuxConcurrent(b *testing.B) {
+	b.StopTimer()
+	c, err := redistest.Dial()
+	if err != nil {
+		b.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	m := redisx.NewConnMux(c)
+
+	var wg sync.WaitGroup
+	wg.Add(numConcurrent)
+
+	b.StartTimer()
+
+	for i := 0; i < numConcurrent; i++ {
+		go func() {
+			defer wg.Done()
+			for i := 0; i < b.N; i++ {
+				c := m.Get()
+				if _, err := c.Do("PING"); err != nil {
+					b.Fatal(err)
+				}
+				c.Close()
+			}
+		}()
+	}
+	wg.Wait()
+}
+
+func BenchmarkPoolConcurrent(b *testing.B) {
+	b.StopTimer()
+
+	p := redis.Pool{Dial: redistest.Dial, MaxIdle: numConcurrent}
+	defer p.Close()
+
+	// Fill the pool.
+	conns := make([]redis.Conn, numConcurrent)
+	for i := range conns {
+		c := p.Get()
+		if err := c.Err(); err != nil {
+			b.Fatal(err)
+		}
+		conns[i] = c
+	}
+	for _, c := range conns {
+		c.Close()
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(numConcurrent)
+
+	b.StartTimer()
+
+	for i := 0; i < numConcurrent; i++ {
+		go func() {
+			defer wg.Done()
+			for i := 0; i < b.N; i++ {
+				c := p.Get()
+				if _, err := c.Do("PING"); err != nil {
+					b.Fatal(err)
+				}
+				c.Close()
+			}
+		}()
+	}
+	wg.Wait()
+}
+
+func BenchmarkPipelineConcurrency(b *testing.B) {
+	b.StopTimer()
+	c, err := redistest.Dial()
+	if err != nil {
+		b.Fatalf("error connection to database, %v", err)
+	}
+	defer c.Close()
+
+	var wg sync.WaitGroup
+	wg.Add(numConcurrent)
+
+	var pipeline textproto.Pipeline
+
+	b.StartTimer()
+
+	for i := 0; i < numConcurrent; i++ {
+		go func() {
+			defer wg.Done()
+			for i := 0; i < b.N; i++ {
+				id := pipeline.Next()
+				pipeline.StartRequest(id)
+				c.Send("PING")
+				c.Flush()
+				pipeline.EndRequest(id)
+				pipeline.StartResponse(id)
+				_, err := c.Receive()
+				if err != nil {
+					b.Fatal(err)
+				}
+				pipeline.EndResponse(id)
+			}
+		}()
+	}
+	wg.Wait()
+}
@@ -0,0 +1,17 @@
+// Copyright 2012 Gary Burd
+//
+// Licensed under the Apache License, Version 2.0 (the "License"): you may
+// not use this file except in compliance with the License. You may obtain
+// a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations
+// under the License.
+
+// Package redisx contains experimental features for Redigo. Features in this
+// package may be modified or deleted at any time.
+package redisx // import "github.com/garyburd/redigo/redisx"
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+*.txt
		2	+.idea/
0	\ No newline at end of file	3	\ No newline at end of file
@@ -0,0 +1,57 @@		@@ -0,0 +1,57 @@
	1	+package conf
	2	+
	3	+import (
	4	+ "encoding/xml"
	5	+ "io/ioutil"
	6	+ _ "strings"
	7	+
	8	+ "common/logger"
	9	+)
	10	+
	11	+type RedisConf struct {
	12	+ Host string `xml:",attr"`
	13	+ Db uint32 `xml:",attr"`
	14	+ Password string `xml:",attr"`
	15	+}
	16	+
	17	+type TexasConf struct {
	18	+ ServerHttpAddr ServerHttpAddrConf `xml:"ServerHttpAddr"`
	19	+ Redis RedisConf `xml:"Redis"`
	20	+}
	21	+
	22	+var (
	23	+ config = new(TexasConf)
	24	+)
	25	+
	26	+func GetRedisConf() RedisConf {
	27	+ return config.Redis
	28	+}
	29	+
	30	+func LoadConf(filename string) error {
	31	+ content, err := ioutil.ReadFile(filename)
	32	+ if err != nil {
	33	+ logger.Notic("read file:%v error:", filename, err)
	34	+ return err
	35	+ }
	36	+ logger.Info("conf xml:%v", string(content))
	37	+ err = xml.Unmarshal(content, config)
	38	+ if err != nil {
	39	+ logger.Notic("decode xml error:%v", err)
	40	+ return err
	41	+ }
	42	+ DumpConf()
	43	+ return nil
	44	+}
	45	+
	46	+func DumpConf() {
	47	+ logger.Info("--------------config dump----start--------")
	48	+ logger.Info("--------------config dump----end--------")
	49	+}
	50	+
	51	+func GetServerHttpAddrConf() string {
	52	+ return config.ServerHttpAddr.Host
	53	+}
	54	+
	55	+type ServerHttpAddrConf struct {
	56	+ Host string `xml:",attr"`
	57	+}
	@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
		1	+<?xml version="1.0" encoding="UTF-8"?>
		2	+<Config>
		3	+ <ServerHttpAddr Host="127.0.0.1:50056" />
		4	+ <Redis Host="172.21.0.25:6379" Db="6" Password="crs-lzslccdc:redis@YXp8Jk#MV" />
		5	+</Config>
0	\ No newline at end of file	6	\ No newline at end of file
@@ -0,0 +1,456 @@		@@ -0,0 +1,456 @@
	1	+package logic
	2	+
	3	+type UserLoginData struct {
	4	+ //Uuid int `json:"uuid"`
	5	+ Fromid int `json:"fromid"`
	6	+ Sharetype int `json:"sharetype"`
	7	+}
	8	+
	9	+type UserLoginResp struct {
	10	+ Code int `json:"code"`
	11	+ Message string `json:"message"`
	12	+ Gold int64 `json:"gold"`
	13	+ Love int64 `json:"love"`
	14	+ Goldrate int64 `json:"goldrate"`
	15	+ Loverate int64 `json:"loverate"`
	16	+ Highestlv int `json:"highestlv"`
	17	+ Curboxlv int `json:"curboxlv"`
	18	+ Isdoublegold int `json:"isdoublegold"`
	19	+ Isauto int `json:"isauto"`
	20	+ Offlinegold int64 `json:"offlinegold"`
	21	+ Offlinelove int64 `json:"offlinelove"`
	22	+ Data []DataDesc `json:"data"`
	23	+}
	24	+
	25	+type GetUserDataReq struct {
	26	+ //Uuid int `json:"uuid"`
	27	+}
	28	+
	29	+type GetUserDataResp struct {
	30	+ Code int `json:"code"`
	31	+ Message string `json:"message"`
	32	+ Gold int64 `json:"gold"`
	33	+ Love int64 `json:"love"`
	34	+ Dougoldlefttime int `json:"dougoldlefttime"`
	35	+ Automlefttime int `json:"automlefttime"`
	36	+ Acclcteboxlefttime int `json:"acclcteboxlefttime"`
	37	+ Israndgift int `json:"israndgift"`
	38	+}
	39	+
	40	+type DataDesc struct {
	41	+ Pos int `json:"pos"`
	42	+ Catlv int `json:"cat_lv"`
	43	+ Countdown int `json:"countdown"`
	44	+}
	45	+
	46	+type ExchangePosReq struct {
	47	+ //Uuid int `json:"uuid"`
	48	+ Pos_1 int `json:"pos_1"`
	49	+ Pos_2 int `json:"pos_2"`
	50	+}
	51	+
	52	+type ExchangePosResp struct {
	53	+ Code int `json:"code"`
	54	+ Message string `json:"message"`
	55	+ Pos1_lv int `json:"pos1_lv"`
	56	+ Pos2_lv int `json:"pos2_lv"`
	57	+ Highest_lv int `json:"highest_lv"`
	58	+ Add_num int `json:"add_num"`
	59	+}
	60	+
	61	+type ClickBoxReq struct {
	62	+ //Uuid int `json:"uuid"`
	63	+ Pos int `json:"pos"`
	64	+}
	65	+
	66	+type ClickBoxResp struct {
	67	+ Code int `json:"code"`
	68	+ Message string `json:"message"`
	69	+ Pos int `json:"pos"`
	70	+ Lv int `json:"lv"`
	71	+}
	72	+
	73	+type UpgradeBoxReq struct {
	74	+ //Uuid int `json:"uuid"`
	75	+}
	76	+type UpgradeBoxResp struct {
	77	+ Code int `json:"code"`
	78	+ Message string `json:"message"`
	79	+ Boxlv int `json:"boxlv"`
	80	+}
	81	+
	82	+type GenerateBoxReq struct {
	83	+ //Uuid int `json:"uuid"`
	84	+ Pos int `json:"pos"`
	85	+}
	86	+
	87	+type GenerateBoxResp struct {
	88	+ Code int `json:"code"`
	89	+ Message string `json:"message"`
	90	+}
	91	+
	92	+type AcclecteReq struct {
	93	+ //Uuid int `json:"uuid"`
	94	+}
	95	+type AcclecteResp struct {
	96	+ Code int `json:"code"`
	97	+ Message string `json:"message"`
	98	+}
	99	+
	100	+type AcclecteBoxResp struct {
	101	+ Code int `json:"code"`
	102	+ Message string `json:"message"`
	103	+}
	104	+
	105	+type AutomergeReq struct {
	106	+ //Uuid int `json:"uuid"`
	107	+}
	108	+type AutomergeResp struct {
	109	+ Code int `json:"code"`
	110	+ Message string `json:"message"`
	111	+}
	112	+
	113	+type QueryBuyCatReq struct {
	114	+ //Uuid int `json:"uuid"`
	115	+}
	116	+type QueryBuyCatResp struct {
	117	+ Code int `json:"code"`
	118	+ Message string `json:"message"`
	119	+ Maxcatlv int `json:"maxcatlv"`
	120	+ Data []BuyCatDesc `json:"data"`
	121	+}
	122	+
	123	+type BuyCatDesc struct {
	124	+ Lv int `json:"lv"`
	125	+ Goldnum int64 `json:"goldnum"`
	126	+}
	127	+
	128	+type ClickRandGiftReq struct {
	129	+ //Uuid int `json:"uuid"`
	130	+}
	131	+type ClickRandGiftResp struct {
	132	+ Code int `json:"code"`
	133	+ Message string `json:"message"`
	134	+ Gold int64 `json:"gold"`
	135	+ Lefttime int `json:"lefttime"`
	136	+}
	137	+
	138	+type DoBuyCatReq struct {
	139	+ Lv int `json:"lv"`
	140	+}
	141	+type DoBuyCatResp struct {
	142	+ Code int `json:"code"`
	143	+ Message string `json:"message"`
	144	+ Pos int `json:"pos"`
	145	+}
	146	+
	147	+type QueryWareHouseResp struct {
	148	+ Code int `json:"code"`
	149	+ Message string `json:"message"`
	150	+ Data []DataDesc `json:"data"`
	151	+}
	152	+
	153	+type QueryAutomergeResp struct {
	154	+ Code int `json:"code"`
	155	+ Message string `json:"message"`
	156	+ Goldrate int64 `json:"goldrate"`
	157	+ Higestlv int `json:"higestlv"`
	158	+ Curcatjianum int `json:"curcatjianum"`
	159	+ Data []DataDesc `json:"data"`
	160	+}
	161	+
	162	+type PutWareHouseReq struct {
	163	+ Pos int `json:"pos"`
	164	+}
	165	+type PutWareHouseResp struct {
	166	+ Code int `json:"code"`
	167	+ Message string `json:"message"`
	168	+ Warepos int `json:"warepos"`
	169	+}
	170	+
	171	+type TakeWareHouseReq struct {
	172	+ Warepos int `json:"warepos"`
	173	+}
	174	+type TakeWareHouseResp struct {
	175	+ Code int `json:"code"`
	176	+ Message string `json:"message"`
	177	+ Pos int `json:"pos"`
	178	+}
	179	+
	180	+type CatRoomDesc struct {
	181	+ Pos int `json:"pos"`
	182	+ Catlv int `json:"cat_lv"`
	183	+}
	184	+
	185	+type QueryCatRoomInfoResp struct {
	186	+ Code int `json:"code"`
	187	+ Message string `json:"message"`
	188	+ Data []CatRoomDesc `json:"data"`
	189	+}
	190	+
	191	+type BuyCatRoomReq struct {
	192	+ Lv int `json:"lv"`
	193	+}
	194	+
	195	+type BuyCatRoomResp struct {
	196	+ Code int `json:"code"`
	197	+ Message string `json:"message"`
	198	+}
	199	+
	200	+type UpCattoRoomReq struct {
	201	+ Roompos int `json:"roompos"`
	202	+ Callv int `json:"callv"`
	203	+ Optype int `json:"optype"`
	204	+}
	205	+
	206	+type UpCattoRoommResp struct {
	207	+ Code int `json:"code"`
	208	+ Message string `json:"message"`
	209	+}
	210	+
	211	+type QueryCatShopInfoResp struct {
	212	+ Code int `json:"code"`
	213	+ Message string `json:"message"`
	214	+ Chapter int `json:"chapter"`
	215	+ Section int `json:"section"`
	216	+ Lefttime int `json:"lefttime"`
	217	+ Canwatch int `json:"canwatch"`
	218	+ Storyhappen int `json:"storyhappen"`
	219	+}
	220	+
	221	+type CatShoPlayReq struct {
	222	+ Catlv int `json:"catlv"`
	223	+}
	224	+type CatShoPlayResp struct {
	225	+ Code int `json:"code"`
	226	+ Message string `json:"message"`
	227	+ Lefttime int `json:"lefttime"`
	228	+ Canwatch int `json:"canwatch"`
	229	+}
	230	+
	231	+type GetCatShopRewardReq struct {
	232	+ Optype int `json:"optype"`
	233	+}
	234	+
	235	+type GetCatShopRewardResp struct {
	236	+ Code int `json:"code"`
	237	+ Message string `json:"message"`
	238	+ Love int64 `json:"love"`
	239	+}
	240	+
	241	+type AcclecteCatStoryResp struct {
	242	+ Code int `json:"code"`
	243	+ Message string `json:"message"`
	244	+}
	245	+
	246	+type UpdateUserInfoReq struct {
	247	+ Headurl string `json:"headurl"`
	248	+ Nickname string `json:"nickname"`
	249	+ Realname string `json:"realname"`
	250	+}
	251	+
	252	+type UpdateUserInfoResp struct {
	253	+ Code int `json:"code"`
	254	+ Message string `json:"message"`
	255	+}
	256	+
	257	+type RankInfoDesc struct {
	258	+ Rank int `json:"rank"`
	259	+ Headurl string `json:"headurl"`
	260	+ Nickname string `json:"nickname"`
	261	+ Catlv int `json:"catlv"`
	262	+ Goldnum int64 `json:"goldnum"`
	263	+}
	264	+
	265	+type QueryPlayerRankResp struct {
	266	+ Code int `json:"code"`
	267	+ Message string `json:"message"`
	268	+ Data []RankInfoDesc `json:"data"`
	269	+}
	270	+
	271	+type QueryCompleteTaskDesc struct {
	272	+ Taskid int `json:"taskid"`
	273	+}
	274	+
	275	+type QueryOnlienTaskDesc struct {
	276	+ Taskid int `json:"taskid"`
	277	+ Lefttime int64 `json:"lefttime"`
	278	+}
	279	+
	280	+type QueryCompleteTaskResp struct {
	281	+ Code int `json:"code"`
	282	+ Message string `json:"message"`
	283	+ Data []QueryCompleteTaskDesc `json:"data"`
	284	+ Online []QueryOnlienTaskDesc `json:"online"`
	285	+}
	286	+
	287	+type QueryCompleteAchievementDesc struct {
	288	+ Achieveid int `json:"achieveid"`
	289	+}
	290	+
	291	+type QueryCompleteAchievementResp struct {
	292	+ Code int `json:"code"`
	293	+ Message string `json:"message"`
	294	+ Data []QueryCompleteAchievementDesc `json:"data"`
	295	+}
	296	+
	297	+type GetTaskRewardReq struct {
	298	+ Taskid int `json:"taskid"`
	299	+}
	300	+
	301	+type GetTaskRewardResp struct {
	302	+ Code int `json:"code"`
	303	+ Message string `json:"message"`
	304	+}
	305	+
	306	+type GetAchieveRewardReq struct {
	307	+ Achieveid int `json:"achieveid"`
	308	+}
	309	+
	310	+type GetAchieveRewardResp struct {
	311	+ Code int `json:"code"`
	312	+ Message string `json:"message"`
	313	+}
	314	+
	315	+type StartOnlineTaskReq struct {
	316	+ Taskid int `json:"taskid"`
	317	+}
	318	+
	319	+type StartOnlineTaskResp struct {
	320	+ Code int `json:"code"`
	321	+ Message string `json:"message"`
	322	+ Lefttime int `json:"lefttime"`
	323	+}
	324	+
	325	+type GetOfflineRewardReq struct {
	326	+ Optype int `json:"optype"`
	327	+}
	328	+
	329	+type GetOfflineRewardResp struct {
	330	+ Code int `json:"code"`
	331	+ Message string `json:"message"`
	332	+ Gold int64 `json:"gold"`
	333	+ Love int64 `json:"love"`
	334	+}
	335	+
	336	+//**********************************************************************************************************
	337	+
	338	+type PosData struct {
	339	+ Pos int
	340	+ Catlv int
	341	+ Countdown int //倒计时为0表示没有
	342	+ //UpPos int //上阵的位置 0表示未上阵
	343	+}
	344	+
	345	+//玩家购买猫详情
	346	+type BuyCatInfoData struct {
	347	+ Buytime int //购买次数
	348	+ IsMaxBuytime int //是否达到涨价上线 1是0否
	349	+ CurPrice int64 //当前价格
	350	+}
	351	+
	352	+//猫咖店家具数据
	353	+type CatRoomData struct {
	354	+ LvCatlv int //入住猫的等级
	355	+}
	356	+
	357	+//猫咖门店数据
	358	+type CatShopData struct {
	359	+ Chapter int //当前所处进度对应shopcaofig的id
	360	+ Section int //当前小节进度，即当前大章节第几次故事
	361	+ IsPlaying int //是否处于探险模式 1是0否
	362	+ LeftTime int //探险剩余时间
	363	+ PlayTimes int //当前为第几次探险
	364	+ DayNum int //当天日期，用于判断跨天
	365	+ TotalWatchNumLeft int //当天剩余看视频次数
	366	+ ThisIsWatch int //本次探险是否已经看过视频
	367	+ IsMax int //是否已经通关 1是0否
	368	+ CurCatLv int //参加探险的猫等级
	369	+ IsStoryHappen int //此次是否触发故事
	370	+}
	371	+
	372	+//玩家排行榜数据
	373	+type UserRankInfo struct {
	374	+ Gold int64 //金币
	375	+ Head string //头像地址
	376	+ NickName string //昵称
	377	+ Highestlv int //当前最高猫等级
	378	+ Uuid int //uuid
	379	+}
	380	+
	381	+//玩家任务数据每日清零
	382	+type TaskData struct {
	383	+ //StartOnline int //开始计算在线时间
	384	+ StartOnline map[int]int64 //记录对应takid 和开始计时的时间
	385	+ BuyCatTime int //商店购买猫次数
	386	+ MergeTime int //合成猫次数
	387	+ PlayWithTime int //陪玩次数
	388	+ WatchAddTime int //看广告次数
	389	+ CompleteId map[int]int //已经完成的任务的id，对应task表的id value无用
	390	+ HaveComplete map[int]int //记录当日已完成的任务，已完成则不再完成
	391	+}
	392	+
	393	+//玩家成就数据
	394	+type AchieveMentData struct {
	395	+ GetNewCatTime int //累计解锁新猫次数
	396	+ GetAllJia int //累计获得猫爬架次数
	397	+ GetRoomJu int //累计解锁新家具次数
	398	+ StoryTime int //累计解锁故事
	399	+ ShopTime int //累计解锁店铺
	400	+ CompleteId map[int]int //已经完成的任务的id，对应achievement表id value为无用
	401	+ HaveComplete map[int]int //记录已完成成就已完成则不再触发
	402	+}
	403	+
	404	+//玩家数据
	405	+type UserData struct {
	406	+ Gold int64 //金币
	407	+ Love int64 //爱心值
	408	+ Goldrate int64 //金币生成速率
	409	+ Loverate int64 //爱心生产速率
	410	+ Highestlv int //当前最高猫等级
	411	+ InviteId int //邀请者uid
	412	+ CurBoxLv int //当前猫箱子等级
	413	+ IsDouble int //当前加速标签 1表示双倍收益 0表示正常
	414	+ IsAuto int //当前是否自动合成
	415	+ IsBoxAcc int //是否处于加速生成箱子状态
	416	+ RandGiftNum int //当前剩余空投猫粮次数
	417	+ RandGiftDay int //记录当前猫粮日期，当日期变化则重置RandGiftNum
	418	+ RandGiftTime int //记录上一次空投猫粮时间
	419	+ Redbag int //红包值单位为分
	420	+ Head string //头像地址
	421	+ NickName string //昵称
	422	+ RealName string //实名
	423	+ IsFirstRedBgCat int //是否合成过红包猫 0表示否1表示是
	424	+ OfflineGold int64 //离线金币
	425	+ OfflineLove int64 //离线爱心
	426	+ CatShopInfo CatShopData //猫咖门店数据
	427	+ Taskinfo TaskData //任务数据
	428	+ AchieveMent AchieveMentData //成就数据
	429	+ PosInfo []PosData //位置信息从0开始
	430	+ BuyCatInfo []BuyCatInfoData //商店购买猫数据第一个元素为1级猫第二个为2级猫以此类推
	431	+ CatRoomInfo []CatRoomData //猫咖店数据
	432	+
	433	+}
	434	+
	435	+//仓库数据详情
	436	+type WareHouseDesc struct {
	437	+ Warelv int //红包猫等级对应表id
	438	+}
	439	+
	440	+//玩家仓库数据
	441	+type UserWareHouseData struct {
	442	+ Info []WareHouseDesc //下标表示位置
	443	+}
	444	+
	445	+const (
	446	+ TASK_TYPE_ONLINE = 1 //在线
	447	+ TASK_TYPE_BUYCAT = 2 //商店购买猫
	448	+ TASK_TYPE_MERGE = 3 //合成猫
	449	+ TASK_TYPE_PLAYWITHCAT = 4 //猫咪陪玩
	450	+ TASK_TYPE_WATCHADD = 5 //观看广告
	451	+ ACH_TYPE_GETCAT = 6 //累计解锁猫
	452	+ ACH_TYPE_GETCATJIA = 7 //累计获得猫爬架
	453	+ ACH_TYPE_GETCATROOMJIA = 8 //累计解锁新家具
	454	+ ACH_TYPE_GETSTORY = 9 //累计解锁新故事
	455	+ ACH_TYPE_GBESHOP = 10 //累计用于新店铺
	456	+)
@@ -0,0 +1,106 @@		@@ -0,0 +1,106 @@
	1	+package logic
	2	+
	3	+import (
	4	+ "HttpServer/conf"
	5	+ "bytes"
	6	+ "common/logger"
	7	+ "encoding/json"
	8	+ "strconv"
	9	+
	10	+ "io/ioutil"
	11	+ //"log"
	12	+ "net/http"
	13	+)
	14	+
	15	+//定时处理倒计时
	16	+func StartHttpTicker() {
	17	+
	18	+}
	19	+
	20	+func StartHttpServe() {
	21	+ startServerHttpServe()
	22	+}
	23	+
	24	+//just for test
	25	+func Testsendhttp() {
	26	+ var test UserLoginData
	27	+ //test.Uuid = 100
	28	+ test.Fromid = 200
	29	+ test.Sharetype = 1
	30	+
	31	+ client := &http.Client{}
	32	+
	33	+ bys, err := json.Marshal(&test)
	34	+ if err != nil {
	35	+ logger.Error("testsendhttp failed=%v", err)
	36	+ return
	37	+ }
	38	+ body := bytes.NewBuffer(bys)
	39	+ url := "http://127.0.0.1:50056/cat/login"
	40	+ reqest, err := http.NewRequest("POST", url, body)
	41	+ if err != nil {
	42	+ logger.Error("http.NewRequest failed")
	43	+ }
	44	+ reqest.Header.Add("Uuid", "101")
	45	+ //发送
	46	+ //res, err := http.Post(url, "application/json;charset=utf-8", body)
	47	+ res, err := client.Do(reqest)
	48	+ if err != nil {
	49	+ logger.Error(" post failed to %v err:%v data:%v", url, err, string(bys))
	50	+ return
	51	+ }
	52	+
	53	+ result, _ := ioutil.ReadAll(res.Body)
	54	+ res.Body.Close()
	55	+
	56	+ s := string(result)
	57	+ var resp GetUserDataResp
	58	+ resp.Code = 0
	59	+ var rdata UserLoginResp
	60	+ _ = json.Unmarshal([]byte(s), &rdata)
	61	+ logger.Info("testsendhttp , body:%v", rdata)
	62	+}
	63	+
	64	+func CheckErr(err error) {
	65	+ if err != nil {
	66	+ panic(err)
	67	+ }
	68	+}
	69	+
	70	+func startServerHttpServe() {
	71	+ http.HandleFunc("/cat/login", UserLogin) //登录
	72	+
	73	+
	74	+ err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
	75	+ CheckErr(err)
	76	+}
	77	+
	78	+
	79	+
	80	+func UserLogin(w http.ResponseWriter, r *http.Request) {
	81	+ //logger.Info("%%%%%%%%%%%%%%%%path=%v", *r.URL)
	82	+ //for k, v := range r.Header {
	83	+ // logger.Info("*********************key=%v,value=%v", k, v)
	84	+ //}
	85	+
	86	+ //w.Header().Add("Access-Control-Allow-Headers", "")
	87	+ //w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session,X_Requested_With,Accept, Origin, Host, Connection, Accept-Encoding, Accept-Language,DNT, X-CustomHeader, Keep-Alive, User-Agent, X-Requested-With, If-Modified-Since, Cache-Control, Content-Type, Pragma")
	88	+
	89	+ Uuid := 0
	90	+ if len(r.Header) > 0 {
	91	+ Uuid, _ = strconv.Atoi(r.Header.Get("Uuid"))
	92	+ }
	93	+
	94	+ if Uuid == 0 {
	95	+ return
	96	+ }
	97	+ result, _ := ioutil.ReadAll(r.Body)
	98	+ r.Body.Close()
	99	+
	100	+ s := string(result)
	101	+ logger.Info("UserLogin , body:%v,uuid=%v", s, Uuid)
	102	+
	103	+ //HandlerLogin(w, s, Uuid)
	104	+}
	105	+
	106	+
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+package logic
0	\ No newline at end of file	2	\ No newline at end of file
@@ -0,0 +1,76 @@		@@ -0,0 +1,76 @@
	1	+package main
	2	+
	3	+import (
	4	+ "HttpServer/conf"
	5	+
	6	+ "HttpServer/logic"
	7	+ "HttpServer/redishandler"
	8	+ "common/logger"
	9	+ "flag"
	10	+ "os"
	11	+ "runtime/pprof"
	12	+ "time"
	13	+)
	14	+
	15	+func InitLogger(file string, lvl int) {
	16	+ logger.New(file, lvl, logger.Rotate{Size: logger.GB, Expired: time.Hour * 24 * 7, Interval: time.Hour * 24})
	17	+}
	18	+
	19	+func main() {
	20	+ //defer utils.PrintPanicStack()
	21	+ filename := flag.String("conf_path", "./conf/world.xml", "config file path")
	22	+ logpath := flag.String("logpath", "./log", "log file path")
	23	+ cpuprofile := flag.String("cpuprofile", "", "write cpu profile to file")
	24	+ secs := flag.Int("exitsecs", 0, "how many secs to exit, defaut 0 to never exit")
	25	+ lvl := flag.Int("lvl", 6, "log level default -debug")
	26	+ flag.Parse()
	27	+ InitLogger(logpath+"/world.log", lvl)
	28	+ logger.Info("config file path:%v", *filename)
	29	+
	30	+ if *cpuprofile != "" {
	31	+ f, err := os.Create(*cpuprofile)
	32	+ if err != nil {
	33	+ logger.Info("open cpu profile error %v:", err)
	34	+ } else {
	35	+ pprof.StartCPUProfile(f)
	36	+ defer pprof.StopCPUProfile()
	37	+ }
	38	+ }
	39	+ var ch chan int = make(chan int)
	40	+ go waitFor(ch, *secs)
	41	+
	42	+ err := conf.LoadConf(*filename)
	43	+ if err != nil {
	44	+ logger.Info("error load conf fail %v:", err)
	45	+ return
	46	+ }
	47	+
	48	+
	49	+
	50	+ err = redishandler.Init()
	51	+ if err != nil {
	52	+ logger.Info("err init redis err=%v", err)
	53	+ return
	54	+ }
	55	+
	56	+ go logic.StartHttpServe()
	57	+ go logic.StartHttpTicker()
	58	+ time.Sleep(time.Duration(2) * time.Second)
	59	+ logic.Testsendhttp()
	60	+
	61	+ select {
	62	+ case _ = <-ch:
	63	+ logger.Info("---I'm done----")
	64	+ break
	65	+ }
	66	+}
	67	+
	68	+func waitFor(ch chan int, secs int) {
	69	+ if secs <= 0 {
	70	+ return
	71	+ }
	72	+ time.Sleep(time.Duration(secs) * time.Second)
	73	+
	74	+ logger.Info("-------------ready to exit--------------------")
	75	+ ch <- 1
	76	+}
@@ -0,0 +1,125 @@		@@ -0,0 +1,125 @@
	1	+package redishandler
	2	+
	3	+import (
	4	+ "HttpServer/conf"
	5	+ "common/logger"
	6	+ "common/redis"
	7	+ "encoding/json"
	8	+ "errors"
	9	+ "strconv"
	10	+)
	11	+
	12	+const USER_TOKEN_KEY = "login_token"
	13	+
	14	+var gRedis *redis.RedisClient = nil
	15	+
	16	+func GetRedisClient() *redis.RedisClient {
	17	+ return gRedis
	18	+}
	19	+
	20	+type TestInfo struct {
	21	+ Gold int64 //金币
	22	+ Head string //头像地址
	23	+ NickName string //昵称
	24	+ Highestlv int //当前最高猫等级
	25	+ Uuid int //uuid
	26	+}
	27	+
	28	+type Mytest struct {
	29	+ Test1 int
	30	+ M_userInfo map[int]int
	31	+}
	32	+
	33	+func TestMyredis() {
	34	+ //testmap
	35	+ var test Mytest
	36	+ test.Test1 = 1
	37	+ test.M_userInfo = make(map[int]int)
	38	+ test.M_userInfo[1] = 1
	39	+ test.M_userInfo[1] = 2
	40	+ test.M_userInfo[2] = 2
	41	+ ddt, _ := json.Marshal(&test)
	42	+ gRedis.SetString("testddt", string(ddt))
	43	+ logger.Info("testddt test=%v.ddt=%v", test, string(ddt))
	44	+
	45	+ rest, err := gRedis.GetString("testddt")
	46	+ if err != nil {
	47	+ logger.Error("TestMyredis ddtfailed err=%v", err)
	48	+ } else {
	49	+ var restest Mytest
	50	+ err = json.Unmarshal([]byte(rest), &restest)
	51	+ logger.Info("testddt rest=%v,restest=%v", rest, restest)
	52	+
	53	+ }
	54	+ //gRedis.HSet("luheng", "luhengsb", "22")
	55	+ //gRedis.HSet("luheng", "luhengbb", "33")
	56	+
	57	+ var rinfo TestInfo
	58	+ rinfo.Gold = 100
	59	+ rinfo.Highestlv = 99
	60	+ rinfo.Head = "sb"
	61	+ rinfo.NickName = "sd"
	62	+ rinfo.Uuid = 1004
	63	+ rinfostr, _ := json.Marshal(&rinfo)
	64	+ err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
	65	+ if err != nil {
	66	+ logger.Info("TestMyredis failed err=%v", err)
	67	+ } else {
	68	+ logger.Info("TestMyredis success rinfostr=%v", string(rinfostr))
	69	+ }
	70	+ rinfo.Gold = 1000
	71	+ rinfo.Highestlv = 99
	72	+ rinfo.Head = "sb1"
	73	+ rinfo.NickName = "sd1"
	74	+ rinfo.Uuid = 1005
	75	+ rinfostr, _ = json.Marshal(&rinfo)
	76	+ err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
	77	+ rinfo.Gold = 10000
	78	+ rinfo.Highestlv = 99
	79	+ rinfo.Head = "sb2"
	80	+ rinfo.NickName = "sd2"
	81	+ rinfo.Uuid = 1006
	82	+ rinfostr, _ = json.Marshal(&rinfo)
	83	+ err = gRedis.Zadd("luhengtest", float64(rinfo.Gold), string(rinfostr))
	84	+
	85	+ vv, err := gRedis.ZRevRangewithIndex("luhengtest", 0, -1)
	86	+ if err == nil {
	87	+ for k, v := range vv {
	88	+ rinfobyte, _ := v.([]byte)
	89	+ var rinfo TestInfo
	90	+ //logger.Info("TestMyredis ori=%v", string(v.([]byte)))
	91	+ err := json.Unmarshal(rinfobyte, &rinfo)
	92	+ if err == nil {
	93	+ logger.Info("TestMyredis k=%v,v=%v", k, rinfo)
	94	+ } else {
	95	+ logger.Info("TestMyredis isbigsb err=%v", err)
	96	+ }
	97	+
	98	+ }
	99	+ } else {
	100	+ logger.Info("test is err=%v", err)
	101	+ }
	102	+}
	103	+
	104	+func Init() error {
	105	+ redis_cfg := conf.GetRedisConf()
	106	+ if gRedis = redis.NewRedisClient(redis_cfg.Host, redis_cfg.Password, redis_cfg.Db); gRedis == nil {
	107	+ return errors.New("initRedis error")
	108	+ }
	109	+
	110	+ logger.Info("init redis success!")
	111	+ TestMyredis()
	112	+ return nil
	113	+}
	114	+
	115	+/*
	116	+ 加载token
	117	+*/
	118	+func LoadPlayerTokenFromRedis(uid int) (string, error) {
	119	+ token, err := gRedis.HGet(USER_TOKEN_KEY, strconv.Itoa(uid))
	120	+ if err != nil {
	121	+ logger.Notic("LoadPlayerTokenFromRedis failed uid:%v err%v", uid, err)
	122	+ return "", err
	123	+ }
	124	+ return token, err
	125	+}
@@ -0,0 +1,125 @@		@@ -0,0 +1,125 @@
	1	+// Copyright 2014 beego Author. All Rights Reserved.
	2	+//
	3	+// Licensed under the Apache License, Version 2.0 (the "License");
	4	+// you may not use this file except in compliance with the License.
	5	+// You may obtain a copy of the License at
	6	+//
	7	+// http://www.apache.org/licenses/LICENSE-2.0
	8	+//
	9	+// Unless required by applicable law or agreed to in writing, software
	10	+// distributed under the License is distributed on an "AS IS" BASIS,
	11	+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	12	+// See the License for the specific language governing permissions and
	13	+// limitations under the License.
	14	+
	15	+// source code is here : https://github.com/astaxie/beego/blob/master/utils/safemap.go
	16	+
	17	+//package utils
	18	+package beegomap
	19	+
	20	+import (
	21	+ "sync"
	22	+)
	23	+
	24	+// BeeMap is a map with lock
	25	+type BeeMap struct {
	26	+ lock *sync.RWMutex
	27	+ Bm map[uint32]interface{}
	28	+}
	29	+
	30	+// NewBeeMap return new safemap
	31	+func NewBeeMap() *BeeMap {
	32	+ return &BeeMap{
	33	+ lock: new(sync.RWMutex),
	34	+ Bm: make(map[uint32]interface{}),
	35	+ }
	36	+}
	37	+
	38	+// Get from maps return the k's value
	39	+func (m *BeeMap) Get(k uint32) interface{} {
	40	+ m.lock.RLock()
	41	+ defer m.lock.RUnlock()
	42	+ if val, ok := m.Bm[k]; ok {
	43	+ return val
	44	+ }
	45	+ return nil
	46	+}
	47	+
	48	+// Set Maps the given key and value. Returns false
	49	+// if the key is already in the map and changes nothing.
	50	+func (m *BeeMap) Set(k uint32, v interface{}) bool {
	51	+ m.lock.Lock()
	52	+ defer m.lock.Unlock()
	53	+ if val, ok := m.Bm[k]; !ok {
	54	+ m.Bm[k] = v
	55	+ } else if val != v {
	56	+ m.Bm[k] = v
	57	+ } else {
	58	+ return false
	59	+ }
	60	+ return true
	61	+}
	62	+
	63	+//force set
	64	+func (m *BeeMap) Replace(k uint32, v interface{}) bool {
	65	+ m.lock.Lock()
	66	+ defer m.lock.Unlock()
	67	+ delete(m.Bm, k)
	68	+ if val, ok := m.Bm[k]; !ok {
	69	+ m.Bm[k] = v
	70	+ } else if val != v {
	71	+ m.Bm[k] = v
	72	+ } else {
	73	+ return false
	74	+ }
	75	+ return true
	76	+}
	77	+
	78	+// Check Returns true if k is exist in the map.
	79	+func (m *BeeMap) Check(k uint32) bool {
	80	+ m.lock.RLock()
	81	+ defer m.lock.RUnlock()
	82	+ if _, ok := m.Bm[k]; !ok {
	83	+ return false
	84	+ }
	85	+ return true
	86	+}
	87	+
	88	+// Delete the given key and value.
	89	+func (m *BeeMap) Delete(k uint32) {
	90	+ m.lock.Lock()
	91	+ defer m.lock.Unlock()
	92	+ delete(m.Bm, k)
	93	+}
	94	+
	95	+// Items returns all items in safemap.
	96	+func (m *BeeMap) Items() map[uint32]interface{} {
	97	+ m.lock.RLock()
	98	+ defer m.lock.RUnlock()
	99	+ r := make(map[uint32]interface{})
	100	+ for k, v := range m.Bm {
	101	+ r[k] = v
	102	+ }
	103	+ return r
	104	+}
	105	+
	106	+func (m *BeeMap) Len() uint32 {
	107	+ m.lock.RLock()
	108	+ defer m.lock.RUnlock()
	109	+ return uint32(len(m.Bm))
	110	+}
	111	+
	112	+func (m *BeeMap) Clear() {
	113	+ items := m.Items()
	114	+ for k := range items {
	115	+ m.Delete(k)
	116	+ }
	117	+}
	118	+func (m *BeeMap) GetRandomKey() uint32 {
	119	+ m.lock.RLock()
	120	+ defer m.lock.RUnlock()
	121	+ for k := range m.Items() {
	122	+ return k
	123	+ }
	124	+ return 0
	125	+}
@@ -0,0 +1,280 @@		@@ -0,0 +1,280 @@
	1	+package logger
	2	+
	3	+import (
	4	+ "fmt"
	5	+ "log"
	6	+ "os"
	7	+ "path/filepath"
	8	+ "strconv"
	9	+ "strings"
	10	+ "sync"
	11	+ "sync/atomic"
	12	+ "time"
	13	+)
	14	+
	15	+type ByteSize float64
	16	+
	17	+const (
	18	+ _ = iota
	19	+ KB ByteSize = 1 << (10 * iota)
	20	+ MB
	21	+ GB
	22	+ TB
	23	+ PB
	24	+ EB
	25	+ ZB
	26	+ YB
	27	+)
	28	+
	29	+const (
	30	+ checkSize = 2 * time.Minute
	31	+ checkExpired = 2 * time.Hour
	32	+)
	33	+
	34	+var (
	35	+ stdFatal = log.New(os.Stderr, "\033[0;33mFATAL:\033[0m ", log.LstdFlags\|log.Lshortfile)
	36	+ stdError = log.New(os.Stderr, "\033[0;31mERROR:\033[0m ", log.LstdFlags\|log.Lshortfile)
	37	+ stdWarn = log.New(os.Stderr, "\033[0;35mWARN:\033[0m ", log.LstdFlags\|log.Lshortfile)
	38	+ ll *Logger
	39	+)
	40	+
	41	+type Logger struct {
	42	+ errCount int32
	43	+ rotate Rotate
	44	+ level chan int
	45	+
	46	+ rwm sync.RWMutex
	47	+ file *os.File
	48	+ debug, info, notic, warn, err, fatal *log.Logger
	49	+}
	50	+
	51	+type Rotate struct {
	52	+ Size ByteSize
	53	+ Expired, Interval time.Duration
	54	+}
	55	+
	56	+func New(fp string, lvl int, rotate Rotate) *Logger {
	57	+ f, err := os.OpenFile(fp, os.O_RDWR\|os.O_CREATE\|os.O_APPEND, 0666)
	58	+ if err != nil {
	59	+ stdFatal.Fatalln(err.Error())
	60	+ }
	61	+ ll = new(Logger)
	62	+ ll.rotate = rotate
	63	+ ll.file = f
	64	+ ll.level = make(chan int)
	65	+ go ll.loop()
	66	+ ll.SetLevel(lvl)
	67	+ return ll
	68	+}
	69	+
	70	+func (l *Logger) SetLevel(lvl int) {
	71	+ l.level <- lvl
	72	+}
	73	+
	74	+func (l Logger) setLevel(f os.File, lvl int) {
	75	+ switch {
	76	+ case lvl > 5:
	77	+ l.debug = log.New(f, "\033[0;36mDEBUG:\033[0m ", log.LstdFlags\|log.Lshortfile)
	78	+ fallthrough
	79	+ case lvl > 4:
	80	+ l.info = log.New(f, "INFO: ", log.LstdFlags\|log.Lshortfile)
	81	+ fallthrough
	82	+ case lvl > 3:
	83	+ l.notic = log.New(f, "\033[0;32mNOTIC:\033[0m ", log.LstdFlags\|log.Lshortfile)
	84	+ fallthrough
	85	+ case lvl > 2:
	86	+ l.warn = log.New(f, "\033[0;35mWARN:\033[0m ", log.LstdFlags\|log.Lshortfile)
	87	+ fallthrough
	88	+ case lvl > 1:
	89	+ l.err = log.New(f, "\033[0;31mERROR:\033[0m ", log.LstdFlags\|log.Lshortfile)
	90	+ fallthrough
	91	+ case lvl > 0:
	92	+ l.fatal = log.New(f, "\033[0;33mFATAL:\033[0m ", log.LstdFlags\|log.Lshortfile)
	93	+ }
	94	+ switch {
	95	+ case lvl < 1:
	96	+ l.fatal = nil
	97	+ fallthrough
	98	+ case lvl < 2:
	99	+ l.err = nil
	100	+ fallthrough
	101	+ case lvl < 3:
	102	+ l.warn = nil
	103	+ fallthrough
	104	+ case lvl < 4:
	105	+ l.notic = nil
	106	+ fallthrough
	107	+ case lvl < 5:
	108	+ l.info = nil
	109	+ fallthrough
	110	+ case lvl < 6:
	111	+ l.debug = nil
	112	+ }
	113	+}
	114	+
	115	+func (l *Logger) getFileSize() ByteSize {
	116	+ l.rwm.RLock()
	117	+ defer l.rwm.RUnlock()
	118	+ fi, err := l.file.Stat()
	119	+ if err != nil {
	120	+ Warn("get log file size failed, no trunc %s", err.Error())
	121	+ return 0.0
	122	+ }
	123	+ return ByteSize(fi.Size())
	124	+}
	125	+
	126	+func (l *Logger) trunc(fp, ext string, lvl int) {
	127	+ l.rwm.Lock()
	128	+ defer l.rwm.Unlock()
	129	+ err := l.file.Close()
	130	+ if err != nil {
	131	+ stdWarn.Println("fail to close log file", err.Error())
	132	+ return
	133	+ }
	134	+ err = os.Rename(fp, fp+ext)
	135	+ if err != nil {
	136	+ stdWarn.Println("fail to rename log file, no trunc", err.Error())
	137	+ }
	138	+ f, err := os.OpenFile(fp, os.O_RDWR\|os.O_CREATE\|os.O_APPEND, 0666)
	139	+ if err != nil {
	140	+ Error("create log file failed %s", err.Error())
	141	+ return
	142	+ }
	143	+ l.setLevel(f, lvl)
	144	+ l.file = f
	145	+}
	146	+
	147	+func suffix(t time.Time) string {
	148	+ y, m, d := t.Date()
	149	+ return "-" + fmt.Sprintf("%04d%02d%02d%02d", y, m, d, t.Hour())
	150	+}
	151	+
	152	+func toNextBound(d time.Duration) time.Duration {
	153	+ return time.Now().Truncate(d).Add(d).Sub(time.Now())
	154	+}
	155	+
	156	+func (l *Logger) loop() error {
	157	+ interval := time.After(toNextBound(l.rotate.Interval))
	158	+ expired := time.After(checkExpired)
	159	+ var sizeExt, lvl int = 1, 4
	160	+ fp, err := filepath.Abs(l.file.Name())
	161	+ if err != nil {
	162	+ stdFatal.Fatalln("get log filepath failed %s", err.Error())
	163	+ }
	164	+ for {
	165	+ var size <-chan time.Time
	166	+ if toNextBound(l.rotate.Interval) != checkSize {
	167	+ size = time.After(checkSize)
	168	+ }
	169	+ select {
	170	+ case lvl = <-l.level:
	171	+ l.rwm.Lock()
	172	+ l.setLevel(l.file, lvl)
	173	+ l.rwm.Unlock()
	174	+ Notic("log level change to %d", lvl)
	175	+ case t := <-interval:
	176	+ interval = time.After(l.rotate.Interval)
	177	+ l.trunc(fp, suffix(t), lvl)
	178	+ sizeExt = 1
	179	+ Notic("log truncated by time interval")
	180	+ case <-expired:
	181	+ expired = time.After(checkExpired)
	182	+ err := filepath.Walk(filepath.Dir(fp),
	183	+ func(path string, info os.FileInfo, err error) error {
	184	+ if err != nil {
	185	+ return nil
	186	+ }
	187	+ isLog := strings.Contains(info.Name(), ".log")
	188	+
	189	+ //log.Println("strings.Contains(", info.Name(), " log') isLog = ", isLog)
	190	+ if time.Since(info.ModTime()) > l.rotate.Expired && isLog && info.IsDir() == false {
	191	+ if err := os.Remove(path); err != nil {
	192	+ return err
	193	+ }
	194	+ Notic("remove expired log files %s", filepath.Base(path))
	195	+ }
	196	+ return nil
	197	+ })
	198	+ if err != nil {
	199	+ Warn("remove expired logs failed %s", err.Error())
	200	+ }
	201	+ case t := <-size:
	202	+ if l.getFileSize() < l.rotate.Size {
	203	+ break
	204	+ }
	205	+ l.trunc(fp, suffix(t)+"."+strconv.Itoa(sizeExt), lvl)
	206	+ sizeExt++
	207	+ Notic("log over size, truncated")
	208	+ }
	209	+ }
	210	+}
	211	+
	212	+// Debug log debug message with cyan color.
	213	+func Debug(format string, v ...interface{}) {
	214	+ ll.rwm.RLock()
	215	+ if ll.debug != nil {
	216	+ ll.debug.Output(2, fmt.Sprintf(format, v...))
	217	+ }
	218	+ ll.rwm.RUnlock()
	219	+}
	220	+
	221	+// Info log normal message.
	222	+func Info(format string, v ...interface{}) {
	223	+ ll.rwm.RLock()
	224	+ if ll.info != nil {
	225	+ ll.info.Output(2, fmt.Sprintf(format, v...))
	226	+ }
	227	+ ll.rwm.RUnlock()
	228	+}
	229	+
	230	+// Notice log notice message with blue color.
	231	+func Notic(format string, v ...interface{}) {
	232	+ ll.rwm.RLock()
	233	+ if ll.notic != nil {
	234	+ ll.notic.Output(2, fmt.Sprintf(format, v...))
	235	+ }
	236	+ ll.rwm.RUnlock()
	237	+}
	238	+
	239	+// Error log error message with red color.
	240	+func Error(format string, v ...interface{}) {
	241	+ atomic.AddInt32(&ll.errCount, 1)
	242	+ stdError.Output(2, fmt.Sprintf(format, v...))
	243	+ ll.rwm.RLock()
	244	+ if ll.err != nil {
	245	+ ll.err.Output(2, fmt.Sprintf(format, v...))
	246	+ }
	247	+ ll.rwm.RUnlock()
	248	+}
	249	+
	250	+func ErrCount() int32 {
	251	+ ec := atomic.LoadInt32(&ll.errCount)
	252	+ if ec < 0 {
	253	+ Warn("error count overflow")
	254	+ return -1
	255	+ }
	256	+ return ec
	257	+}
	258	+
	259	+func Fatal(format string, v ...interface{}) {
	260	+ stdFatal.Output(2, fmt.Sprintf(format, v...))
	261	+ ll.rwm.RLock()
	262	+ if ll.fatal != nil {
	263	+ ll.fatal.Output(2, fmt.Sprintf(format, v...))
	264	+ }
	265	+ ll.rwm.RUnlock()
	266	+ os.Exit(1)
	267	+}
	268	+
	269	+func Warn(format string, v ...interface{}) {
	270	+ stdWarn.Output(2, fmt.Sprintf(format, v...))
	271	+ ll.rwm.RLock()
	272	+ if ll.warn != nil {
	273	+ ll.warn.Output(2, fmt.Sprintf(format, v...))
	274	+ }
	275	+ ll.rwm.RUnlock()
	276	+}
	277	+
	278	+func GetLogger() *Logger {
	279	+ return ll
	280	+}