Merge with 0.4

[prosody.git] / core / modulemanager.lua

diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 4391fc7fc16c5938dce284a400800ffc73a4d800..cc48c2f6776ed58cfa29bbdc9408d770a99b01de 100644 (file)
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -123,6 +123,10 @@ function load(host, module_name, config)
        -- Use modified host, if the module set one
        modulemap[api_instance.host][module_name] = pluginenv;
        
+       if api_instance.host == "*" and host ~= "*" then
+               api_instance:set_global();
+       end
+               
        return true;
 end
 
@@ -204,7 +208,7 @@ function handle_stanza(host, origin, stanza)
        local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type;
        if name == "iq" and xmlns == "jabber:client" then
                if stanza.attr.type == "get" or stanza.attr.type == "set" then
-                       xmlns = stanza.tags[1].attr.xmlns;
+                       xmlns = stanza.tags[1].attr.xmlns or "jabber:client";
                        log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
                else
                        log("debug", "Discarding %s from %s of type: %s", name, origin_type, stanza.attr.type);
@@ -260,6 +264,10 @@ end
 
 function api:set_global()
        self.host = "*";
+       -- Update the logger
+       local _log = logger.init("mod_"..self.name);
+       self.log = function (self, ...) return _log(...); end;
+       self._log = _log;
 end
 
 local function _add_handler(module, origin_type, tag, xmlns, handler)