From 47761d875a1db3f3f7415e0f137b3b0287c640e2 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Fri, 28 Nov 2008 20:17:20 +0500 Subject: Added option core.data_path --- util/datamanager.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index 80b35733..f25fffb3 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -17,6 +17,8 @@ local indent = function(f, i) end end +local data_path = "data"; + module "datamanager" @@ -70,14 +72,18 @@ end ------- API ------------- +function set_data_path(path) + data_path = path; +end + function getpath(username, host, datastore, ext) ext = ext or "dat"; if username then - return format("data/%s/%s/%s.%s", encode(host), datastore, encode(username), ext); + return format("%s/%s/%s/%s.%s", data_path, encode(host), datastore, encode(username), ext); elseif host then - return format("data/%s/%s.%s", encode(host), datastore, ext); + return format("%s/%s/%s.%s", data_path, encode(host), datastore, ext); else - return format("data/%s.%s", datastore, ext); + return format("%s/%s.%s", data_path, datastore, ext); end end -- cgit v1.2.3 From 34b736f5cf8a7c09f460c982dbf9332989da868e Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sat, 29 Nov 2008 05:53:11 +0500 Subject: Fixed logging in datamanager --- util/datamanager.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'util/datamanager.lua') diff --git a/util/datamanager.lua b/util/datamanager.lua index f25fffb3..99eef9f3 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -3,7 +3,7 @@ local setmetatable, type = setmetatable, type; local pairs, ipairs = pairs, ipairs; local char = string.char; local loadfile, setfenv, pcall = loadfile, setfenv, pcall; -local log = log; +local log = require "util.logger".init("datamanager"); local io_open = io.open; local os_remove = os.remove; local tostring, tonumber = tostring, tonumber; @@ -25,8 +25,6 @@ module "datamanager" ---- utils ----- local encode, decode; -local log = function (type, msg) return log(type, "datamanager", msg); end - do local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end }); -- cgit v1.2.3