Merge hoelzro->trunk

[prosody.git] / net / xmppcomponent_listener.lua

diff --git a/net/xmppcomponent_listener.lua b/net/xmppcomponent_listener.lua
index 5532186b1d4734f61f4418a6ea01d03572cba714..6f02b136954027a78a8ac03c01a95065a3c95dd2 100644 (file)
--- a/net/xmppcomponent_listener.lua
+++ b/net/xmppcomponent_listener.lua
@@ -73,13 +73,10 @@ function stream_callbacks.streamopened(session, attr)
                return;
        end
        
-       -- Store the original host (this is used for config, etc.)
-       session.user = attr.to;
-       -- Set the host for future reference
-       session.host = config.get(attr.to, "core", "component_address") or attr.to;
        -- Note that we don't create the internal component 
        -- until after the external component auths successfully
 
+       session.host = attr.to;
        session.streamid = uuid_gen();
        session.notopen = nil;
        
@@ -89,7 +86,7 @@ function stream_callbacks.streamopened(session, attr)
 end
 
 function stream_callbacks.streamclosed(session)
-       session.log("Received </stream:stream>");
+       session.log("debug", "Received </stream:stream>");
        session:close();
 end
 
@@ -206,7 +203,7 @@ function component_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));
-               if session.host then
+               if hosts[session.host] then
                        log("debug", "Deregistering component");
                        cm_deregister_component(session.host);
                        hosts[session.host].connected = nil;