From: Matthew Wild <mwild1@gmail.com>
Date: Fri, 7 Jan 2011 11:56:52 +0000 (+0000)
Subject: prosodyctl: Instead of calling  datamanager.set_path(), just ensure prosody.paths... 
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=d90eb97717be72a73f64a5d8c1eb09749c811f82;hp=7a6ab6461ea53d99fb6fb011949e6a66ffa7a609;p=prosody.git

prosodyctl: Instead of calling  datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config)
---

diff --git a/prosodyctl b/prosodyctl
index 18f430c5..2c31c641 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -109,13 +109,14 @@ end
 local original_logging_config = config.get("*", "core", "log");
 config.set("*", "core", "log", { { levels = { min="info" }, to = "console" } });
 
+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 = data_path };
+
 require "core.loggingmanager"
 
 dependencies.log_warnings();
 
-local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
-require "util.datamanager".set_data_path(data_path);
-
 -- Switch away from root and into the prosody user --
 local switched_user, current_uid;