net.http: Update print()s to log()s - don't ask how this came to be, I have no idea :)

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index d8418d832df9cf5008a6cddc41fc98cb80eafcac..1174352b97085e723aa1672ef8d05bba2ef5340c 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -127,6 +127,7 @@ function load(host, module_name, config)
        local api_instance = setmetatable({ name = module_name, host = host, config = config,  _log = _log, log = function (self, ...) return _log(...); end }, { __index = api });
 
        local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
+       api_instance.environment = pluginenv;
        
        setfenv(mod, pluginenv);
        if not hosts[host] then
@@ -157,7 +158,7 @@ function load(host, module_name, config)
                log("error", "Error initializing module '%s' on '%s': %s", module_name, host, err or "nil");
        end
        if success then
-               hosts[host].events.fire_event("module-loaded", { module = module_name, host = host });
+               (hosts[api_instance.host] or prosody).events.fire_event("module-loaded", { module = module_name, host = host });
                return true;
        else -- load failed, unloading
                unload(api_instance.host, module_name);
@@ -209,7 +210,7 @@ function unload(host, name, ...)
                end
        end
        modulemap[host][name] = nil;
-       hosts[host].events.fire_event("module-unloaded", { module = name, host = host });
+       (hosts[host] or prosody).events.fire_event("module-unloaded", { module = name, host = host });
        return true;
 end
 
@@ -397,7 +398,7 @@ function api:require(lib)
                f, n = pluginloader.load_code(lib, lib..".lib.lua");
        end
        if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
-       setfenv(f, setmetatable({ module = self }, { __index = _G }));
+       setfenv(f, self.environment);
        return f();
 end