From 915c46522445eb721af9eb62ff5d1b649a30f07c Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Thu, 7 Jul 2016 22:01:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BD=D1=8B=D0=BD=D0=B5=20=D0=BC?= =?UTF-8?q?=D1=8B=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BF=D1=83=D0=BB=20=D1=81=D0=BE=D0=B5=D0=B4=D0=B8?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=BB=D1=8F=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B8=D1=81=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/data/SkinItem.go | 4 ++-- lib/services/services.go | 4 ++-- minecraft-skinsystem.go | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/data/SkinItem.go b/lib/data/SkinItem.go index 3916ccd..ae0de56 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.Redis.Cmd("SET", tools.BuildKey(s.Nickname), str) + services.RedisPool.Cmd("SET", tools.BuildKey(s.Nickname), str) } func FindRecord(username string) (SkinItem, error) { var record SkinItem; - result, err := services.Redis.Cmd("GET", tools.BuildKey(username)).Str(); + result, err := services.RedisPool.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 d62f7ac..f0f612d 100644 --- a/lib/services/services.go +++ b/lib/services/services.go @@ -1,10 +1,10 @@ package services import ( - "github.com/mediocregopher/radix.v2/redis" + "github.com/mediocregopher/radix.v2/pool" "github.com/gorilla/mux" ) -var Redis *redis.Client +var RedisPool *pool.Pool var Router *mux.Router diff --git a/minecraft-skinsystem.go b/minecraft-skinsystem.go index 0090ff5..b1bf97f 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/redis" + "github.com/mediocregopher/radix.v2/pool" "elyby/minecraft-skinsystem/lib/routes" "elyby/minecraft-skinsystem/lib/services" @@ -15,7 +15,7 @@ import ( func main() { runtime.GOMAXPROCS(runtime.NumCPU()) - client, redisErr := redis.Dial("tcp", "redis:6379") + pool, redisErr := pool.New("tcp", "redis:6379", 10) 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.Redis = client + services.RedisPool = pool services.Router = router log.Fatal(http.ListenAndServe(":80", router))