Merge 0.10->trunk

[prosody.git] / plugins / mod_component.lua

diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index a5136f6ca528f3628e32b065b81dcb09f871ebc7..340faec02c1e6267c3d1327f3e7a5e5d1f605091 100644 (file)
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -31,7 +31,7 @@ local sessions = module:shared("sessions");
 
 function module.add_host(module)
        if module:get_host_type() ~= "component" then
-               error("Don't load mod_component manually, it should be for a component, please see http://prosody.im/doc/components", 0);
+               error("Don't load mod_component manually, it should be for a component, please see https://prosody.im/doc/components", 0);
        end
        
        local env = module.environment;
@@ -40,7 +40,7 @@ function module.add_host(module)
 
        local send;
 
-       local function on_destroy(session, err)
+       local function on_destroy(session, err) --luacheck: ignore 212/err
                env.connected = false;
                env.session = false;
                send = nil;
@@ -149,7 +149,7 @@ local stream_callbacks = { default_ns = xmlns_component };
 
 local xmlns_xmpp_streams = "urn:ietf:params:xml:ns:xmpp-streams";
 
-function stream_callbacks.error(session, error, data, data2)
+function stream_callbacks.error(session, error, data)
        if session.destroyed then return; end
        module:log("warn", "Error processing component stream: %s", tostring(error));
        if error == "no-stream" then
@@ -295,7 +295,7 @@ function listener.onconnect(conn)
                session.stream:reset();
        end
 
-       function session.data(conn, data)
+       function session.data(_, data)
                local ok, err = stream:feed(data);
                if ok then return; end
                module:log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
@@ -314,6 +314,7 @@ function listener.ondisconnect(conn, err)
        local session = sessions[conn];
        if session then
                (session.log or log)("info", "component disconnected: %s (%s)", tostring(session.host), tostring(err));
+               module:fire_event("component-disconnected", { session = session, reason = err });
                if session.on_destroy then session:on_destroy(err); end
                sessions[conn] = nil;
                for k in pairs(session) do
@@ -322,7 +323,6 @@ function listener.ondisconnect(conn, err)
                        end
                end
                session.destroyed = true;
-               session = nil;
        end
 end