aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-09-30 19:52:00 +0100
committerMatthew Wild <mwild1@gmail.com>2008-09-30 19:52:00 +0100
commita53395e6b72ac0abad00123e1d07b3504f585e08 (patch)
treeabcdd55cfafbc477ea75067efd89b5845f4cad19 /util
parent733c39e3dacf91f10fcb2f9501b6f0618a0b11fc (diff)
downloadprosody-a53395e6b72ac0abad00123e1d07b3504f585e08.tar.gz
prosody-a53395e6b72ac0abad00123e1d07b3504f585e08.zip
Huge commit to:
* Break stanza routing (to be restored in a future commit) * Remove the old stanza_dispatcher code, which was never going to be maintainable nor extendable :) * Bring us plugins, starting with mod_legacyauth and mod_roster * Sessions are now created/destroyed using a standard sessionmanager interface
Diffstat (limited to 'util')
-rw-r--r--util/logger.lua23
-rw-r--r--util/stanza.lua1
2 files changed, 24 insertions, 0 deletions
diff --git a/util/logger.lua b/util/logger.lua
new file mode 100644
index 00000000..3d672e94
--- /dev/null
+++ b/util/logger.lua
@@ -0,0 +1,23 @@
+
+local format = string.format;
+local print = print;
+local debug = debug;
+local tostring = tostring;
+module "logger"
+
+function init(name)
+ name = nil; -- While this line is not commented, will automatically fill in file/line number info
+ return function (level, message, ...)
+ if not name then
+ local inf = debug.getinfo(2, 'Snl');
+ level = level .. ","..tostring(inf.short_src):match("[^/]*$")..":"..inf.currentline;
+ end
+ if ... then
+ print(level, format(message, ...));
+ else
+ print(level, message);
+ end
+ end
+end
+
+return _M; \ No newline at end of file
diff --git a/util/stanza.lua b/util/stanza.lua
index 3a17fc20..553bba4d 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -136,3 +136,4 @@ function presence(attr)
return stanza("presence", attr);
end
+return _M; \ No newline at end of file