diff options
Diffstat (limited to 'lib/gitano/log.lua')
-rw-r--r-- | lib/gitano/log.lua | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/lib/gitano/log.lua b/lib/gitano/log.lua index e1df00b..7df5e76 100644 --- a/lib/gitano/log.lua +++ b/lib/gitano/log.lua @@ -111,7 +111,7 @@ local function set_prefix(new_prefix) prefix = "" else if new_prefix == "true" then - new_prefix = "Gitano" + new_prefix = "Gitano" end prefix = "[" .. tostring(new_prefix) .. "] " end @@ -121,7 +121,7 @@ local function AT(LVL, ...) if level >= LVL then local strs = {...} for i = 1, #strs do - strs[i] = tostring(strs[i]) or "?" + strs[i] = tostring(strs[i]) or "?" end stream:write(prefix .. concat(strs, " ") .. "\n") end @@ -187,8 +187,7 @@ local function deepdebug(...) end local function set_level(l) - if type(l) ~= "number" or - l < ERRS or l > DEEPDEBUG then + if type(l) ~= "number" or l < ERRS or l > DEEPDEBUG then level = WARN warn("Attempted to set level to", tostring(l), "- defaulted to warnings") end @@ -196,16 +195,14 @@ local function set_level(l) end local function bump_level(l) - if type(l) ~= "number" or - l < ERRS or l > DEEPDEBUG then + if type(l) ~= "number" or l < ERRS or l > DEEPDEBUG then warn("Attempted to bump level to", tostring(l), "- left alone") end if level < l then level = l end end local function cap_level(l) - if type(l) ~= "number" or - l < ERRS or l > DEEPDEBUG then + if type(l) ~= "number" or l < ERRS or l > DEEPDEBUG then warn("Attempted to cap level to", tostring(l), "- left alone") end if level > l then level = l end @@ -217,33 +214,33 @@ end -- Check for default log level based on environment do - local loglevel = luxio.getenv("LC_GITANO_LOG_LEVEL") or - luxio.getenv("GITANO_LOG_LEVEL") + local loglevel = ( + luxio.getenv("LC_GITANO_LOG_LEVEL") or luxio.getenv("GITANO_LOG_LEVEL")) if loglevel then if tonumber(loglevel) then - set_level(tonumber(loglevel)) + set_level(tonumber(loglevel)) else - loglevel = loglevel:lower() - if (loglevel == "warn" or loglevel == "warning" or - loglevel == "warnings") then - level = WARN - elseif loglevel == "chat" then - level = CHAT - elseif loglevel == "info" then - level = INFO - elseif loglevel == "debug" then - level = DEBUG - elseif (loglevel == "deepdebug" or loglevel == "ddebug" or - loglevel == "all") then - level = DEEPDEBUG - end + loglevel = loglevel:lower() + if (loglevel == "warn" or loglevel == "warning" or + loglevel == "warnings") then + level = WARN + elseif loglevel == "chat" then + level = CHAT + elseif loglevel == "info" then + level = INFO + elseif loglevel == "debug" then + level = DEBUG + elseif (loglevel == "deepdebug" or loglevel == "ddebug" or + loglevel == "all") then + level = DEEPDEBUG + end end if level == nil then - level = WARN + level = WARN end end - local do_debug = luxio.getenv("LC_GITANO_DEBUG") or + local do_debug = luxio.getenv("LC_GITANO_DEBUG") or luxio.getenv("GITANO_DEBUG") if do_debug and do_debug ~= "" then level = DEBUG |