diff --git a/lib/data/SkinItem.go b/lib/data/SkinItem.go index ae0de56..3916ccd 100644 --- a/lib/data/SkinItem.go +++ b/lib/data/SkinItem.go @@ -20,12 +20,12 @@ type SkinItem struct { func (s *SkinItem) Save() { str, _ := json.Marshal(s) - services.RedisPool.Cmd("SET", tools.BuildKey(s.Nickname), str) + services.Redis.Cmd("SET", tools.BuildKey(s.Nickname), str) } func FindRecord(username string) (SkinItem, error) { var record SkinItem; - result, err := services.RedisPool.Cmd("GET", tools.BuildKey(username)).Str(); + result, err := services.Redis.Cmd("GET", tools.BuildKey(username)).Str(); if (err == nil) { decodeErr := json.Unmarshal([]byte(result), &record) if (decodeErr != nil) { diff --git a/lib/services/services.go b/lib/services/services.go index f0f612d..d62f7ac 100644 --- a/lib/services/services.go +++ b/lib/services/services.go @@ -1,10 +1,10 @@ package services import ( - "github.com/mediocregopher/radix.v2/pool" + "github.com/mediocregopher/radix.v2/redis" "github.com/gorilla/mux" ) -var RedisPool *pool.Pool +var Redis *redis.Client var Router *mux.Router diff --git a/minecraft-skinsystem.go b/minecraft-skinsystem.go index b1bf97f..0090ff5 100644 --- a/minecraft-skinsystem.go +++ b/minecraft-skinsystem.go @@ -6,7 +6,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/mediocregopher/radix.v2/pool" + "github.com/mediocregopher/radix.v2/redis" "elyby/minecraft-skinsystem/lib/routes" "elyby/minecraft-skinsystem/lib/services" @@ -15,7 +15,7 @@ import ( func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - pool, redisErr := pool.New("tcp", "redis:6379", 10) + client, redisErr := redis.Dial("tcp", "redis:6379") if redisErr != nil { log.Fatal("Redis unavailable") } @@ -36,7 +36,7 @@ func main() { apiRouter := router.PathPrefix("/api").Subrouter() apiRouter.HandleFunc("/user/{username}/skin", routes.SetSkin).Methods("POST") - services.RedisPool = pool + services.Redis = client services.Router = router log.Fatal(http.ListenAndServe(":80", router))