diff --git a/3rd/lua-rax b/3rd/lua-rax index 36f7f52..7c80520 160000 --- a/3rd/lua-rax +++ b/3rd/lua-rax @@ -1 +1 @@ -Subproject commit 36f7f527375f4221648ad58b2bc20a6be73338eb +Subproject commit 7c80520074c35d1afb99fc4698f6684c9575393d diff --git a/lualib/log.lua b/lualib/log.lua index 0d1ca07..76b2df6 100644 --- a/lualib/log.lua +++ b/lualib/log.lua @@ -5,50 +5,51 @@ local traceback = debug.traceback local M = {} local levels = { - debug = 1, - info = 2, - warn = 3, - error = 4, + debug = 1, + info = 2, + warn = 3, + error = 4, } local level = config.get("wlua_loglevel", "debug") local loglevel = levels[level] function M.is_debug() - if levels.debug < loglevel then return end - return true + if levels.debug < loglevel then return end + return true end function M.debug(...) - if levels.debug < loglevel then return end - local tbl = {} - for i,v in pairs({...}) do - if type(v) == "table" then - tbl[i] = util_table.tostring(v) - else - tbl[i] = tostring(v) - end - end - skynet.error("[DEBUG]", table.concat(tbl, " ")) + if levels.debug < loglevel then return end + local tbl = {} + for i = 1, select('#', ...) do + local v = select(i, ...) + if type(v) == "table" then + tbl[i] = util_table.tostring(v) + else + tbl[i] = tostring(v) or "nil" + end + end + skynet.error("[DEBUG]", table.concat(tbl, " ")) end function M.info(...) - if levels.info < loglevel then return end - skynet.error("[INFO]", ...) + if levels.info < loglevel then return end + skynet.error("[INFO]", ...) end function M.warn(...) - if levels.warn < loglevel then return end - skynet.error("[WARN]", ...) + if levels.warn < loglevel then return end + skynet.error("[WARN]", ...) end function M.error(...) - if levels.error < loglevel then return end - skynet.error("[ERROR]", ...) - skynet.error("[ERROR]", traceback()) + if levels.error < loglevel then return end + skynet.error("[ERROR]", ...) + skynet.error("[ERROR]", traceback()) end function M.log(...) - skynet.error(...) + skynet.error(...) end return M