Diff

core/s2smanager.lua @ 4518:f2d695d2e31e

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 09 Mar 2012 18:46:19 +0000
parent 4512:eb97612bf42b
parent 4513:23b540ab346a
child 4684:dc70c4ffb66d
line wrap: on
line diff
--- a/core/s2smanager.lua	Sat Feb 25 17:21:15 2012 +0000
+++ b/core/s2smanager.lua	Fri Mar 09 18:46:19 2012 +0000
@@ -549,7 +549,7 @@
 		session.from_host = attr.from and nameprep(attr.from);
 	
 		session.streamid = uuid_gen();
-		(session.log or log)("debug", "Incoming s2s received <stream:stream>");
+		(session.log or log)("debug", "Incoming s2s received %s", st.stanza("stream:stream", attr):top_tag());
 		if session.to_host then
 			if not hosts[session.to_host] then
 				-- Attempting to connect to a host we don't serve