From 623d8182eb93c2cb0cb1ea81ecec926da2ce9849 Mon Sep 17 00:00:00 2001 From: Cloud Wu Date: Sat, 10 Oct 2020 18:04:20 +0800 Subject: [PATCH] fix #1246 --- service/launcher.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/service/launcher.lua b/service/launcher.lua index 65545880..e28ccff0 100644 --- a/service/launcher.lua +++ b/service/launcher.lua @@ -31,10 +31,10 @@ local function list_srv(ti, fmt_func, ...) req:add(r) sessions[r] = addr end - for resp, req in req:select(ti) do + for req, resp in req:select(ti) do local stat = resp[1] local addr = req[1] - if resp.ok then + if resp then list[skynet.address(addr)] = fmt_func(stat, addr) else list[skynet.address(addr)] = fmt_func("ERROR", addr) @@ -62,8 +62,8 @@ end function command.MEM(addr, ti) return list_srv(ti, function(kb, addr) local v = services[addr] - if kb == "TIMEOUT" then - return string.format("TIMEOUT (%s)",v) + if type(kb) == "string" then + return string.format("%s (%s)", kb, v) else return string.format("%.2f Kb (%s)",kb,v) end @@ -74,7 +74,7 @@ function command.GC(addr, ti) for k,v in pairs(services) do skynet.send(k,"debug","GC") end - return command.MEM(ti) + return command.MEM(addr, ti) end function command.REMOVE(_, handle, kill)