Merge 0.7/MattJ with 0.7

2 files changed, 6 insertions, 1 deletions

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index a28ae4b2..e87ef536 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -58,6 +58,7 @@ function console_listener.onconnect(conn)
 	local session = console:new_session(conn);
 	sessions[conn] = session;
 	printbanner(session);
+	session.send(string.char(0));
 end
 
 function console_listener.onincoming(conn, data)
diff --git a/prosody b/prosody
index c7f91456..e4e82105 100755
--- a/prosody
+++ b/prosody
@@ -143,6 +143,10 @@ function set_function_metatable()
 			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 @@ function init_data_store()
 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");