diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-05-04 19:57:05 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-05-04 19:57:05 +0100 |
| commit | 2fff09895975e5b2fb3d0aee38c2f652c6029e15 (patch) | |
| tree | f0e16c01357473480d90a6d4726094fbb3aa30ec /util | |
| parent | 9817a326507ae8127365578adfac7a9074fe48c1 (diff) | |
| parent | ef5e994b1f4303d7940194fc980f5b5e94654c76 (diff) | |
| download | prosody-2fff09895975e5b2fb3d0aee38c2f652c6029e15.tar.gz prosody-2fff09895975e5b2fb3d0aee38c2f652c6029e15.zip | |
Merge with 0.4
Diffstat (limited to 'util')
| -rw-r--r-- | util/multitable.lua | 4 | ||||
| -rw-r--r-- | util/serialization.lua | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/util/multitable.lua b/util/multitable.lua index c0bb2205..d1858d8f 100644 --- a/util/multitable.lua +++ b/util/multitable.lua @@ -56,7 +56,7 @@ local function r(t, n, _end, ...) return; end if k then - v = t[k]; + local v = t[k]; if v then r(v, n+1, _end, ...); if not next(v) then @@ -96,7 +96,7 @@ local function s(t, n, results, _end, ...) return; end if k then - v = t[k]; + local v = t[k]; if v then s(v, n+1, results, _end, ...); end diff --git a/util/serialization.lua b/util/serialization.lua index bff0f306..41d963e9 100644 --- a/util/serialization.lua +++ b/util/serialization.lua @@ -14,6 +14,8 @@ local t_concat = table.concat; local error = error; local pairs = pairs; +local debug_traceback = debug.traceback; +local log = require "util.logger".init("serialization"); module "serialization" local indent = function(i) @@ -50,7 +52,7 @@ local function _simplesave(o, ind, t, func) elseif type(o) == "boolean" then func(t, (o and "true" or "false")); else - error("cannot serialize a " .. type(o)) + log("warn", "cannot serialize a %s: %s", type(o), debug_traceback()) end end |