lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #677 from sundream/upstream

Browse Source 
redis-cluster: ensure port is integer
This commit is contained in:
云风
2017-06-27 19:24:12 +08:00
committed by GitHub
parent 9fc8754369 2553afd6c9
commit 86883c7d9a
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lualib/skynet/db/redis/cluster.lua
View File

@@ -74,20 +74,22 @@ function rediscluster:initialize_slots_cache()
local conn = self.connections[name] or self:get_redis_link(startup_node) local conn = self.connections[name] or self:get_redis_link(startup_node)
local list = conn:cluster("slots") local list = conn:cluster("slots")
for _,result in ipairs(list) do for _,result in ipairs(list) do
local ip,port,runid = table.unpack(result[3]) local ip,port = table.unpack(result[3])
assert(ip)
port = assert(tonumber(port))
local master_node = { local master_node = {
host = ip, host = ip,
port = port, port = port,
runid = runid,
slaves = {}, slaves = {},
} }
self:set_node_name(master_node) self:set_node_name(master_node)
for i=4,#result do for i=4,#result do
local ip,port,runid = table.unpack(result[i]) local ip,port = table.unpack(result[i])
assert(ip)
port = assert(tonumber(port))
local slave_node = { local slave_node = {
host = ip, host = ip,
port = port, port = port,
runid = runid,
} }
self:set_node_name(slave_node) self:set_node_name(slave_node)
table.insert(master_node.slaves,slave_node) table.insert(master_node.slaves,slave_node)
@@ -184,10 +186,7 @@ function rediscluster:close_all_connection()
end end
function rediscluster:get_connection(node) function rediscluster:get_connection(node)
if type(node) == "string" then node.port = assert(tonumber(node.port))
local ip,port = string.match(node,"^([^:]+):([^:]+)$")
node = {host=ip,port=port}
end
local name = node.name or nodename(node) local name = node.name or nodename(node)
local conn = self.connections[name] local conn = self.connections[name]
if not conn then if not conn then
@@ -346,9 +345,10 @@ function rediscluster:call(...)
end end
local newslot = tonumber(errlist[2]) local newslot = tonumber(errlist[2])
local node_ip,node_port = string.match(errlist[3],"^([^:]+):([^:]+)$") local node_ip,node_port = string.match(errlist[3],"^([^:]+):([^:]+)$")
node_port = assert(tonumber(node_port))
local node = { local node = {
host = node_ip, host = node_ip,
port = tonumber(node_port), port = node_port,
} }
if not asking then if not asking then
self:set_node_name(node) self:set_node_name(node)