aboutsummaryrefslogtreecommitdiffstats
path: root/core/modulemanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-29 03:27:50 +0000
commit7271c148cef981f9263a8794ebe27634423b07bd (patch)
tree837729c161f9e2d3d65a08790d25bebb37e622e1 /core/modulemanager.lua
parent5b8969b8d9a926294b0f09b3f835ae994d58d012 (diff)
downloadprosody-7271c148cef981f9263a8794ebe27634423b07bd.tar.gz
prosody-7271c148cef981f9263a8794ebe27634423b07bd.zip
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Diffstat (limited to 'core/modulemanager.lua')
-rw-r--r--core/modulemanager.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index ce34f3e6..31059512 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -1,4 +1,5 @@
+local plugin_dir = CFG_PLUGINDIR or "./plugins/";
local logger = require "util.logger";
local log = logger.init("modulemanager")
@@ -11,8 +12,8 @@ local type = type;
local tostring, print = tostring, print;
+-- We need this to let modules access the real global namespace
local _G = _G;
-local debug = debug;
module "modulemanager"
@@ -30,7 +31,7 @@ function load(host, module_name, config)
if not (host and module_name) then
return nil, "insufficient-parameters";
end
- local mod, err = loadfile("plugins/mod_"..module_name..".lua");
+ local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua");
if not mod then
log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil");
return nil, err;