diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-05-06 21:45:25 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-05-06 21:45:25 +0100 |
| commit | 2b7399b4f364e481e5f0192e7fde34345eb1838e (patch) | |
| tree | 9d21851f2de0261972716635a65041d8bfdc83d1 | |
| parent | cdb7f7a610ebf2dd4257a156850731b0b9764b2e (diff) | |
| parent | 95040378fd0373e8e17cddff42b7017d120b78c2 (diff) | |
| download | prosody-2b7399b4f364e481e5f0192e7fde34345eb1838e.tar.gz prosody-2b7399b4f364e481e5f0192e7fde34345eb1838e.zip | |
Merge with 0.4
| -rw-r--r-- | util/prosodyctl.lua | 3 | ||||
| -rw-r--r-- | util/serialization.lua | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 3b523a78..ce223459 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -9,6 +9,9 @@ local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep; local io, os = io, os; local tostring, tonumber = tostring, tonumber; + +local CFG_SOURCEDIR = _G.CFG_SOURCEDIR; + module "prosodyctl" function adduser(params) diff --git a/util/serialization.lua b/util/serialization.lua index 41d963e9..4da811ae 100644 --- a/util/serialization.lua +++ b/util/serialization.lua @@ -52,7 +52,8 @@ local function _simplesave(o, ind, t, func) elseif type(o) == "boolean" then func(t, (o and "true" or "false")); else - log("warn", "cannot serialize a %s: %s", type(o), debug_traceback()) + log("error", "cannot serialize a %s: %s", type(o), debug_traceback()) + func(t, "nil,\n"); end end |