# HG changeset patch # User Matthew Wild # Date 1294401412 0 # Node ID 6ad7ed619d37cefba8440f9c64bed11c9695f655 # Parent 38f3dfe88d4f191c4a64fe3c2480ab0064cb7736 prosodyctl: Instead of calling datamanager.set_path(), just ensure prosody.paths.data always contains the correct value (including config) diff -r 38f3dfe88d4f -r 6ad7ed619d37 prosodyctl --- a/prosodyctl Fri Jan 07 11:56:15 2011 +0000 +++ b/prosodyctl Fri Jan 07 11:56:52 2011 +0000 @@ -109,13 +109,14 @@ 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;