Wed, 03 Dec 2008 13:06:23 +0000
Fix port number in mod_console instructions
30 | 1 | |
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
2 | local format, rep = string.format, string.rep; |
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
3 | local io_write = io.write; |
30 | 4 | local print = print; |
5 | local debug = debug; | |
6 | local tostring = tostring; | |
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
7 | local math_max = math.max; |
262 | 8 | |
9 | local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring; | |
10 | local do_pretty_printing = not os.getenv("WINDIR"); | |
11 | ||
30 | 12 | module "logger" |
13 | ||
262 | 14 | local logstyles = {}; |
15 | ||
16 | --TODO: This should be done in config, but we don't have proper config yet | |
17 | if do_pretty_printing then | |
18 | logstyles["info"] = getstyle("bold"); | |
19 | logstyles["warn"] = getstyle("bold", "yellow"); | |
20 | logstyles["error"] = getstyle("bold", "red"); | |
21 | end | |
22 | ||
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
23 | local sourcewidth = 20; |
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
24 | |
30 | 25 | function init(name) |
147 | 26 | --name = nil; -- While this line is not commented, will automatically fill in file/line number info |
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
27 | sourcewidth = math_max(#name+2, sourcewidth); |
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
28 | local namelen = #name; |
30 | 29 | return function (level, message, ...) |
30 | if not name then | |
53
14ea0fe6ca86
Session destruction fixes, some debugging code while we fix the rest. Also change logger to be more useful.
Matthew Wild <mwild1@gmail.com>
parents:
30
diff
changeset
|
31 | local inf = debug.getinfo(3, 'Snl'); |
30 | 32 | level = level .. ","..tostring(inf.short_src):match("[^/]*$")..":"..inf.currentline; |
33 | end | |
34 | if ... then | |
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
35 | io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", format(message, ...), "\n"); |
30 | 36 | else |
437
c1a720db2157
Nice enhancement for logging output
Matthew Wild <mwild1@gmail.com>
parents:
360
diff
changeset
|
37 | io_write(name, rep(" ", sourcewidth-namelen), getstring(logstyles[level], level), "\t", message, "\n"); |
30 | 38 | end |
39 | end | |
40 | end | |
41 | ||
360
e918c979ad1a
Remove or comment useless prints, or change them to log()
Matthew Wild <mwild1@gmail.com>
parents:
262
diff
changeset
|
42 | return _M; |