# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274093821 -3600
# Node ID a6f89c72d3054348ef55eeb424d161ecdef29320
# Parent  1fadbb2e3ca0834958957d3fe5825772889477a9# Parent  e095d2a98936e8dc69a9eeb981521bf5d3758608
Merge 0.7/MattJ with 0.7

diff -r 1fadbb2e3ca0 -r a6f89c72d305 core/loggingmanager.lua
diff -r 1fadbb2e3ca0 -r a6f89c72d305 plugins/mod_console.lua
--- a/plugins/mod_console.lua	Mon May 17 11:56:36 2010 +0100
+++ b/plugins/mod_console.lua	Mon May 17 11:57:01 2010 +0100
@@ -58,6 +58,7 @@
 	local session = console:new_session(conn);
 	sessions[conn] = session;
 	printbanner(session);
+	session.send(string.char(0));
 end
 
 function console_listener.onincoming(conn, data)
diff -r 1fadbb2e3ca0 -r a6f89c72d305 prosody
--- a/prosody	Mon May 17 11:56:36 2010 +0100
+++ b/prosody	Mon May 17 11:57:01 2010 +0100
@@ -143,6 +143,10 @@
 			debug.setupvalue(f, i, value);
 		end
 	end
+	function mt.__tostring(f)
+		local info = debug.getinfo(f);
+		return ("function(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.linedefined);
+	end
 	debug.setmetatable(function() end, mt);
 end
 
@@ -331,7 +335,7 @@
 end
 
 function prepare_to_start()
-	log("info", "Prosody is using the %s backend for connection handling", server.get_backend());
+	log("debug", "Prosody is using the %s backend for connection handling", server.get_backend());
 	-- Signal to modules that we are ready to start
 	eventmanager.fire_event("server-starting");
 	prosody.events.fire_event("server-starting");