From b7f05a5336c1d232f749f36989845445a0f72ca3 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 7 Jan 2011 11:56:15 +0000 Subject: prosody: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) --- prosody | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'prosody') 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 -- cgit v1.2.3