Merge 0.7->trunk

3 files changed, 10 insertions, 3 deletions

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 4457a2f3..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)
@@ -84,9 +85,10 @@ function console_listener.onincoming(conn, data)
 
 		session.env._ = data;
 		
-		local chunk, err = loadstring("return "..data);
+		local chunkname = "=console";
+		local chunk, err = loadstring("return "..data, chunkname);
 		if not chunk then
-			chunk, err = loadstring(data);
+			chunk, err = loadstring(data, chunkname);
 			if not chunk then
 				err = err:gsub("^%[string .-%]:%d+: ", "");
 				err = err:gsub("^:%d+: ", "");
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 5e9d2544..52b1e0e6 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -82,6 +82,7 @@ local function write_pidfile()
 	end
 	pidfile = module:get_option("pidfile");
 	if pidfile then
+		local err;
 		local mode = stat(pidfile) and "r+" or "w+";
 		pidfile_handle, err = io.open(pidfile, mode);
 		if not pidfile_handle then
diff --git a/prosody b/prosody
index 8e96eb46..88620b38 100755
--- a/prosody
+++ b/prosody
@@ -144,6 +144,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
 
@@ -324,7 +328,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
 	prosody.events.fire_event("server-starting");