X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatamanager.lua;h=d5e9c88ca7ad0130b879060950d579420edb65d1;hb=e157cd13e86685e77c8ba0e9f4e97e729af8d821;hp=5aee289d66cc47b572c99e60c909a2eaf2d3fcad;hpb=39d73bf33260b64ff5b9864952c4ba4001b56087;p=prosody.git diff --git a/util/datamanager.lua b/util/datamanager.lua index 5aee289d..d5e9c88c 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -57,7 +57,7 @@ local function mkdir(path) return path; end -local data_path = prosody.paths.data; +local data_path = (prosody and prosody.paths and prosody.paths.data) or "."; local callbacks = {}; ------- API ------------- @@ -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?