X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fdatamanager.lua;h=4a4d62b3c098519f361912162f9a73e30209c960;hb=95dfe4b0aaaf26ee4651c09eb9757c56210a135a;hp=08d9d6af2e40541aeab30e97b52f92d4af0872fb;hpb=6c82ba7e23f26b863d865ed85afb34867f3e4786;p=prosody.git

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 08d9d6af..4a4d62b3 100644
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -113,12 +113,9 @@ function getpath(username, host, datastore, ext, create)
 	if username then
 		if create then mkdir(mkdir(mkdir(data_path).."/"..host).."/"..datastore); end
 		return format("%s/%s/%s/%s.%s", data_path, host, datastore, username, ext);
-	elseif host then
+	else
 		if create then mkdir(mkdir(data_path).."/"..host); end
 		return format("%s/%s/%s.%s", data_path, host, datastore, ext);
-	else
-		if create then mkdir(data_path); end
-		return format("%s/%s.%s", data_path, datastore, ext);
 	end
 end
 
@@ -190,17 +187,25 @@ function store(username, host, datastore, data)
 
 	-- save the datastore
 	local d = "return " .. serialize(data) .. ";\n";
-	local ok, msg = atomic_store(getpath(username, host, datastore, nil, true), d);
-	if not ok then
-		log("error", "Unable to write to %s storage ('%s') for user: %s@%s", datastore, msg, username or "nil", host or "nil");
-		return nil, "Error saving to storage";
-	end
-	if next(data) == nil then -- try to delete empty datastore
-		log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
-		os_remove(getpath(username, host, datastore));
-	end
-	-- we write data even when we are deleting because lua doesn't have a
-	-- platform independent way of checking for non-exisitng files
+	local mkdir_cache_cleared;
+	repeat
+		local ok, msg = atomic_store(getpath(username, host, datastore, nil, true), d);
+		if not ok then
+			if not mkdir_cache_cleared then -- We may need to recreate a removed directory
+				_mkdir = {};
+				mkdir_cache_cleared = true;
+			else
+				log("error", "Unable to write to %s storage ('%s') for user: %s@%s", datastore, msg, username or "nil", host or "nil");
+				return nil, "Error saving to storage";
+			end
+		end
+		if next(data) == nil then -- try to delete empty datastore
+			log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
+			os_remove(getpath(username, host, datastore));
+		end
+		-- we write data even when we are deleting because lua doesn't have a
+		-- platform independent way of checking for non-exisitng files
+	until ok;
 	return true;
 end
 
@@ -284,7 +289,7 @@ local type_map = {
 
 function users(host, store, typ)
 	typ = type_map[typ or "keyval"];
-	local store_dir = format("%s/%s/%s", data_path, encode(host), encode(store));
+	local store_dir = format("%s/%s/%s", data_path, encode(host), store);
 
 	local mode, err = lfs.attributes(store_dir, "mode");
 	if not mode then
@@ -343,7 +348,6 @@ end
 
 function purge(username, host)
 	local host_dir = format("%s/%s/", data_path, encode(host));
-	local deleted = 0;
 	local errs = {};
 	for file in lfs.dir(host_dir) do
 		if lfs.attributes(host_dir..file, "mode") == "directory" then
@@ -358,4 +362,6 @@ function purge(username, host)
 	return #errs == 0, t_concat(errs, ", ");
 end
 
+_M.path_decode = decode;
+_M.path_encode = encode;
 return _M;