# HG changeset patch # User Waqas Hussain # Date 1230168905 -18000 # Node ID 8ff454831f7d04d26b38908ef6c5c4199cab96d4 # Parent 0ae8584ba3e7e3a2d9ed69618134ac2db51cfd00 Moved directory auto-creation to datamanager diff -r 0ae8584ba3e7 -r 8ff454831f7d prosody --- a/prosody Thu Dec 25 05:16:11 2008 +0500 +++ b/prosody Thu Dec 25 06:35:05 2008 +0500 @@ -108,30 +108,6 @@ local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; require "util.datamanager".set_data_path(data_path); - -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - local x = io.popen("mkdir \""..path.."\" 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); - -eventmanager.add_event_hook("host-activated", mkdirs); - ----------- End of out-of-place code -------------- eventmanager.fire_event("server-starting"); diff -r 0ae8584ba3e7 -r 8ff454831f7d tools/ejabberd2prosody.lua --- a/tools/ejabberd2prosody.lua Thu Dec 25 05:16:11 2008 +0500 +++ b/tools/ejabberd2prosody.lua Thu Dec 25 06:35:05 2008 +0500 @@ -27,40 +27,7 @@ local st = require "util.stanza"; package.loaded["util.logger"] = {init = function() return function() end; end} local dm = require "util.datamanager" -local data_path = "data"; -dm.set_data_path(data_path); - -local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end -local _mkdir = {} -function mkdir(path) - path = path:gsub("/", path_separator); - --print("mkdir",path); - local x = io.popen("mkdir "..path.." 2>&1"):read("*a"); -end -function encode(s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end -function getpath(username, host, datastore, ext) - ext = ext or "dat"; - if username then - return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext); - elseif host then - return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext); - else - return format("%s/%s.%s", data_path, datastore, ext); - end -end -function mkdirs(host) - if not _mkdir[host] then - local host_dir = string.format("%s/%s", data_path, encode(host)); - mkdir(host_dir); - mkdir(host_dir.."/accounts"); - mkdir(host_dir.."/vcard"); - mkdir(host_dir.."/roster"); - mkdir(host_dir.."/private"); - mkdir(host_dir.."/offline"); - _mkdir[host] = true; - end -end -mkdir(data_path); +dm.set_data_path("data"); function build_stanza(tuple, stanza) if tuple[1] == "xmlelement" then @@ -83,31 +50,26 @@ end function vcard(node, host, stanza) - mkdirs(host); local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza)); print("["..(err or "success").."] vCard: "..node.."@"..host); end function password(node, host, password) - mkdirs(host); local ret, err = dm.store(node, host, "accounts", {password = password}); print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password); end function roster(node, host, jid, item) - mkdirs(host); local roster = dm.load(node, host, "roster") or {}; roster[jid] = item; local ret, err = dm.store(node, host, "roster", roster); print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid); end function private_storage(node, host, xmlns, stanza) - mkdirs(host); local private = dm.load(node, host, "private") or {}; private[xmlns] = st.preserialize(stanza); local ret, err = dm.store(node, host, "private", private); print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns); end function offline_msg(node, host, t, stanza) - mkdirs(host); stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t); stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t); local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza)); diff -r 0ae8584ba3e7 -r 8ff454831f7d util/datamanager.lua --- a/util/datamanager.lua Thu Dec 25 05:16:11 2008 +0500 +++ b/util/datamanager.lua Thu Dec 25 06:35:05 2008 +0500 @@ -26,11 +26,13 @@ local log = require "util.logger".init("datamanager"); local io_open = io.open; local os_remove = os.remove; +local io_popen = io.popen; local tostring, tonumber = tostring, tonumber; local error = error; local next = next; local t_insert = table.insert; local append = require "util.serialization".append; +local path_separator = "/"; if os.getenv("WINDIR") then path_separator = "\\" end module "datamanager" @@ -48,21 +50,37 @@ end end +local _mkdir = {}; +local function mkdir(path) + path = path:gsub("/", path_separator); -- TODO as an optimization, do this during path creation rather than here + if not _mkdir[path] then + local x = io_popen("mkdir \""..path.."\" 2>&1"):read("*a"); + _mkdir[path] = true; + end + return path; +end + +local data_path = "data"; + ------- API ------------- -local data_path = "data"; function set_data_path(path) log("info", "Setting data path to %s", path); data_path = path; end -function getpath(username, host, datastore, ext) +function getpath(username, host, datastore, ext, create) ext = ext or "dat"; + host = host and encode(host); + username = username and encode(username); if username then - return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext); + 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 - return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext); + 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 @@ -87,7 +105,7 @@ data = {}; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore), "w+"); + local f, msg = io_open(getpath(username, host, datastore, nil, true), "w+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return; @@ -106,7 +124,7 @@ function list_append(username, host, datastore, data) if not data then return; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore, "list"), "a+"); + local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return; @@ -123,7 +141,7 @@ data = {}; end -- save the datastore - local f, msg = io_open(getpath(username, host, datastore, "list"), "w+"); + local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+"); if not f then log("error", "Unable to write to "..datastore.." storage ('"..msg.."') for user: "..(username or "nil").."@"..(host or "nil")); return;