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

fix: 修复升级lua5.5后的兼容性错误 (#2123)

Browse Source
This commit is contained in:
bitcat🐱
2025-12-24 19:50:38 +08:00
committed by GitHub
parent 9f7634d477
commit a4c6e04ab0
6 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/clusterd.lua
View File

@@ -102,9 +102,9 @@ local function loadconfig(tmp)
local reload = {}
for name,address in pairs(tmp) do
if name:sub(1,2) == "__" then
name = name:sub(3)
config[name] = address
skynet.error(string.format("Config %s = %s", name, address))
local opt = name:sub(3)
config[opt] = address
skynet.error(string.format("Config %s = %s", opt, address))
else
assert(address == false or type(address) == "string")
if node_address[name] ~= address then

9
service/service_mgr.lua
View File

@@ -96,10 +96,11 @@ function cmd.QUERY(service_name, subname)
end
local function list_service()
local val
local result = {}
for k,v in pairs(service) do
if type(v) == "string" then
v = "Error: " .. v
val = "Error: " .. v
elseif type(v) == "table" then
local querying = {}
if v.launch then
@@ -118,12 +119,12 @@ local function list_service()
table.insert(querying, skynet.address(detail.source) .. " " .. tostring(skynet.call(detail.source, "debug", "TASK", detail.session)))
end
end
v = table.concat(querying, "\n")
val = table.concat(querying, "\n")
else
v = skynet.address(v)
val = skynet.address(v)
end
result[k] = v
result[k] = val
end
return result