Merged with trunk

5 files changed, 11 insertions, 8 deletions

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index eb18fced..e375e3bd 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -75,7 +75,7 @@ function handle_stanza(origin, stanza)
 		log("debug", "%s stanza being handled by component: %s", stanza.name, host);
 		component(origin, stanza, hosts[host]);
 	else
-		log("error", "Component manager recieved a stanza for a non-existing component: " .. stanza.attr.to);
+		log("error", "Component manager recieved a stanza for a non-existing component: " .. (stanza.attr.to or stanza));
 	end
 end
 
diff --git a/net/httpserver.lua b/net/httpserver.lua
index af23a91d..8ce25f35 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -52,7 +52,7 @@ local function send_response(request, response)
 		end
 	else
 		-- Response we have is just a string (the body)
-		log("debug", "Sending response to %s: %s", request.id, response);
+		log("debug", "Sending response to %s: %s", request.id or "<none>", response or "<none>");
 		
 		resp = { "HTTP/1.0 200 OK\r\n" };
 		t_insert(resp, "Connection: close\r\n");
diff --git a/net/xmppclient_listener.lua b/net/xmppclient_listener.lua
index 617f0467..5e1a1ba3 100644
--- a/net/xmppclient_listener.lua
+++ b/net/xmppclient_listener.lua
@@ -95,7 +95,7 @@ local function session_close(session, reason)
 		end
 		session.send("</stream:stream>");
 		session.conn.close();
-		xmppclient.disconnect(session.conn, "stream error");
+		xmppclient.disconnect(session.conn, reason.condition or reason or "session closed");
 	end
 end
 
@@ -136,7 +136,7 @@ function xmppclient.disconnect(conn, err)
 	local session = sessions[conn];
 	if session then
 		(session.log or log)("info", "Client disconnected: %s", err);
-		sm_destroy_session(session);
+		sm_destroy_session(session, err);
 		sessions[conn]  = nil;
 		session = nil;
 		collectgarbage("collect");
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 9be37db4..0f2c6711 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -162,7 +162,7 @@ end
 
 def_env.module = {};
 
-local function get_hosts_set(hosts)
+local function get_hosts_set(hosts, module)
 	if type(hosts) == "table" then
 		if hosts[1] then
 			return set.new(hosts);
@@ -172,8 +172,9 @@ local function get_hosts_set(hosts)
 	elseif type(hosts) == "string" then
 		return set.new { hosts };
 	elseif hosts == nil then
+		local mm = require "modulemanager";
 		return set.new(array.collect(keys(prosody.hosts)))
-			/ function (host) return prosody.hosts[host].type == "local"; end;
+			/ function (host) return prosody.hosts[host].type == "local" or module and mm.is_loaded(host, module); end;
 	end
 end
 
@@ -203,7 +204,7 @@ end
 function def_env.module:unload(name, hosts)
 	local mm = require "modulemanager";
 
-	hosts = get_hosts_set(hosts);
+	hosts = get_hosts_set(hosts, name);
 	
 	-- Unload the module for each host
 	local ok, err, count = true, nil, 0;
@@ -225,7 +226,7 @@ end
 function def_env.module:reload(name, hosts)
 	local mm = require "modulemanager";
 
-	hosts = get_hosts_set(hosts);
+	hosts = get_hosts_set(hosts, name);
 	
 	-- Reload the module for each host
 	local ok, err, count = true, nil, 0;
diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index 72ccfdd0..b56aef0a 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -67,3 +67,5 @@ module:hook("message/bare", function(data)
 
 	return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
 end);
+
+module:add_feature("msgoffline");