aboutsummaryrefslogtreecommitdiff
path: root/src/libjin-lua/scripts/log.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjin-lua/scripts/log.lua')
-rw-r--r--src/libjin-lua/scripts/log.lua94
1 files changed, 47 insertions, 47 deletions
diff --git a/src/libjin-lua/scripts/log.lua b/src/libjin-lua/scripts/log.lua
index 02ba234..a0e2310 100644
--- a/src/libjin-lua/scripts/log.lua
+++ b/src/libjin-lua/scripts/log.lua
@@ -10,75 +10,75 @@ log.level = "trace"
local modes = {
- { name = "trace", color = "\27[34m", },
- { name = "debug", color = "\27[36m", },
- { name = "info", color = "\27[32m", },
- { name = "warn", color = "\27[33m", },
- { name = "error", color = "\27[31m", },
- { name = "fatal", color = "\27[35m", },
+ { name = "trace", color = "\27[34m", },
+ { name = "debug", color = "\27[36m", },
+ { name = "info", color = "\27[32m", },
+ { name = "warn", color = "\27[33m", },
+ { name = "error", color = "\27[31m", },
+ { name = "fatal", color = "\27[35m", },
}
local levels = {}
for i, v in ipairs(modes) do
- levels[v.name] = i
+ levels[v.name] = i
end
local round = function(x, increment)
- increment = increment or 1
- x = x / increment
- return (x > 0 and math.floor(x + .5) or math.ceil(x - .5)) * increment
+ increment = increment or 1
+ x = x / increment
+ return (x > 0 and math.floor(x + .5) or math.ceil(x - .5)) * increment
end
local _tostring = tostring
local tostring = function(...)
- local t = {}
- for i = 1, select('#', ...) do
- local x = select(i, ...)
- if type(x) == "number" then
- x = round(x, .01)
- end
- t[#t + 1] = _tostring(x)
+ local t = {}
+ for i = 1, select('#', ...) do
+ local x = select(i, ...)
+ if type(x) == "number" then
+ x = round(x, .01)
end
- return table.concat(t, " ")
+ t[#t + 1] = _tostring(x)
+ end
+ return table.concat(t, " ")
end
for i, x in ipairs(modes) do
- local nameupper = x.name:upper()
- log[x.name] = function(...)
-
- -- Return early if we're below the log level
- if i < levels[log.level] then
- return
- end
-
- local msg = tostring(...)
- local info = debug.getinfo(2, "Sl")
- local lineinfo = info.short_src .. ":" .. info.currentline
-
- -- Output to console
- print(string.format("%s[%-6s%s]%s %s: %s",
- log.usecolor and x.color or "",
- nameupper,
- os.date("%H:%M:%S"),
- log.usecolor and "\27[0m" or "",
- lineinfo,
- msg))
-
- -- Output to log file
- if log.outfile then
- local fp = io.open(log.outfile, "a")
- local str = string.format("[%-6s%s] %s: %s\n",
- nameupper, os.date(), lineinfo, msg)
- fp:write(str)
- fp:close()
- end
+ local nameupper = x.name:upper()
+ log[x.name] = function(...)
+
+ -- Return early if we're below the log level
+ if i < levels[log.level] then
+ return
+ end
+ local msg = tostring(...)
+ local info = debug.getinfo(2, "Sl")
+ local lineinfo = info.short_src .. ":" .. info.currentline
+
+ -- Output to console
+ print(string.format("%s[%-6s%s]%s %s: %s",
+ log.usecolor and x.color or "",
+ nameupper,
+ os.date("%H:%M:%S"),
+ log.usecolor and "\27[0m" or "",
+ lineinfo,
+ msg))
+
+ -- Output to log file
+ if log.outfile then
+ local fp = io.open(log.outfile, "a")
+ local str = string.format("[%-6s%s] %s: %s\n",
+ nameupper, os.date(), lineinfo, msg)
+ fp:write(str)
+ fp:close()
end
+
+ end
end
------------------------------------------------------------------------------------------------------------------