aboutsummaryrefslogtreecommitdiffstats
path: root/util/datamanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-11 05:31:29 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-11 05:31:29 +0000
commitd9b4efc92495618c728a791747a78b36e40a821e (patch)
tree9955881f795b0517126ec0fc67fe0982f212102a /util/datamanager.lua
parentda14cbf95f70cba5770251871971197bde6fde79 (diff)
parent42e80ba8932b6c830845c0e5f01539740975f86c (diff)
downloadprosody-d9b4efc92495618c728a791747a78b36e40a821e.tar.gz
prosody-d9b4efc92495618c728a791747a78b36e40a821e.zip
Merge 0.8->trunk
Diffstat (limited to 'util/datamanager.lua')
-rw-r--r--util/datamanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/datamanager.lua b/util/datamanager.lua
index 2be3acfd..d5e9c88c 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -115,7 +115,7 @@ function load(username, host, datastore)
if not data then
local mode = lfs.attributes(getpath(username, host, datastore), "mode");
if not mode then
- log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+ log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
return nil;
else -- file exists, but can't be read
-- TODO more detailed error checking and logging?
@@ -207,7 +207,7 @@ function list_load(username, host, datastore)
if not data then
local mode = lfs.attributes(getpath(username, host, datastore, "list"), "mode");
if not mode then
- log("debug", "Failed to load "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
+ log("debug", "Assuming empty "..datastore.." storage ('"..ret.."') for user: "..(username or "nil").."@"..(host or "nil"));
return nil;
else -- file exists, but can't be read
-- TODO more detailed error checking and logging?