aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-06 19:50:37 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-06 19:50:37 +0000
commitdcc4ec1050829813fbc8ff74633d900a9c2678e9 (patch)
tree3b2997fd5d43a53819d0853cc7368d013d967eb3
parent75c0e24654f7c97c1708a1cc2a7dabcd37d96d53 (diff)
downloadprosody-dcc4ec1050829813fbc8ff74633d900a9c2678e9.tar.gz
prosody-dcc4ec1050829813fbc8ff74633d900a9c2678e9.zip
Move the setting of data_path to fix #unfiledbug
-rwxr-xr-xprosody7
1 files changed, 4 insertions, 3 deletions
diff --git a/prosody b/prosody
index 584af214..76b8162d 100755
--- a/prosody
+++ b/prosody
@@ -68,8 +68,6 @@ do
end
end
-require "util.datamanager".set_data_path(data_path);
-
local server = require "net.server"
require "util.dependencies"
@@ -78,7 +76,6 @@ require "util.dependencies"
sessions = {};
hosts = {};
-
-- Load and initialise core modules --
require "util.import"
@@ -104,9 +101,13 @@ require "util.jid"
------------------------------------------------------------------------
+
------------- Begin code without a home ---------------------
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)