lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #493 from chenkete/master

Browse Source 
修复redis auth操作没有进行compose_message的bug,该bug导致skynet连接twemproxy时,auth失败
This commit is contained in:
cloudwu
2016-05-09 19:17:56 +08:00
parent ed1a8313f4 4edb586077
commit db17245005
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lualib/redis.lua
View File

@@ -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))