From 4edb586077e75b90a87efe52a01a67ae5c179311 Mon Sep 17 00:00:00 2001 From: chenkete Date: Mon, 9 May 2016 17:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dredis=20auth=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=B2=A1=E6=9C=89=E8=BF=9B=E8=A1=8Ccompose=5Fmessage?= =?UTF-8?q?=E7=9A=84bug,=E8=AF=A5bug=E5=AF=BC=E8=87=B4skynet=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5twemproxy=E6=97=B6,auth=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lualib/redis.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lualib/redis.lua b/lualib/redis.lua index 09147817..750505df 100644 --- a/lualib/redis.lua +++ b/lualib/redis.lua @@ -63,6 +63,7 @@ redcmd[42] = function(fd, data) -- '*' end ------------------- +local compose_message local function redis_login(auth, db) if auth == nil and db == nil then @@ -70,10 +71,10 @@ local function redis_login(auth, db) end return function(so) if auth then - so:request("AUTH "..auth.."\r\n", read_response) + so:request(compose_message("AUTH", auth), read_response) end if db then - so:request("SELECT "..db.."\r\n", read_response) + so:request(compose_message("SELECT", db), read_response) end end end @@ -122,7 +123,7 @@ local count_cache = make_cache(function(t,k) return s end) -local function compose_message(cmd, msg) +function compose_message(cmd, msg) local t = type(msg) local lines = {} @@ -233,7 +234,7 @@ local watchmeta = { local function watch_login(obj, auth) return function(so) if auth then - so:request("AUTH "..auth.."\r\n", read_response) + so:request(compose_message("AUTH", auth), read_response) end for k in pairs(obj.__psubscribe) do so:request(compose_message ("PSUBSCRIBE", k))