# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1294401375 0
# Node ID 38f3dfe88d4f191c4a64fe3c2480ab0064cb7736
# Parent  36555949bd16ba591f1003e789acee496e758135
prosody: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)

diff -r 36555949bd16 -r 38f3dfe88d4f prosody
--- a/prosody	Fri Jan 07 11:55:19 2011 +0000
+++ b/prosody	Fri Jan 07 11:56:15 2011 +0000
@@ -183,9 +183,10 @@
 	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 @@
 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