aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-01-07 11:56:15 +0000
committerMatthew Wild <mwild1@gmail.com>2011-01-07 11:56:15 +0000
commitb7f05a5336c1d232f749f36989845445a0f72ca3 (patch)
tree7de56b14732fbd3345abb6a8c1100ff5435cffdd
parentfb8362bbeedd74829271f43bf43aa11f8c79b169 (diff)
downloadprosody-b7f05a5336c1d232f749f36989845445a0f72ca3.tar.gz
prosody-b7f05a5336c1d232f749f36989845445a0f72ca3.zip
prosody: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)
-rwxr-xr-xprosody7
1 files changed, 3 insertions, 4 deletions
diff --git a/prosody b/prosody
index 42c3acad..8dcb0096 100755
--- a/prosody
+++ b/prosody
@@ -183,9 +183,10 @@ function init_global_state()
prosody.full_sessions = full_sessions;
prosody.hosts = hosts;
+ local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
- plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
-
+ plugins = CFG_PLUGINDIR, data = data_path };
+
prosody.arg = _G.arg;
prosody.platform = "unknown";
@@ -344,8 +345,6 @@ function load_secondary_libraries()
end
function init_data_store()
- local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
- require "util.datamanager".set_data_path(data_path);
require "core.storagemanager";
end