Merge 0.7/MattJ with 0.7

Mon, 17 May 2010 11:57:01 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Mon, 17 May 2010 11:57:01 +0100
changeset 3044
a6f89c72d305
parent 3043
1fadbb2e3ca0 (current diff)
parent 3028
e095d2a98936 (diff)
child 3045
ff5b3932e5f2
child 3047
820ae39e06de

Merge 0.7/MattJ with 0.7

core/loggingmanager.lua file | annotate | diff | comparison | revisions
plugins/mod_console.lua file | annotate | diff | comparison | revisions
--- 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)
--- 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");

mercurial