aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-03-09 18:46:19 +0000
committerMatthew Wild <mwild1@gmail.com>2012-03-09 18:46:19 +0000
commit57b4839a319c57177c831eeb1ca57eb51e1eb971 (patch)
tree7c222d85dc580e33e11963d66a26a2c6bb1c7b1e /core
parent4ba5589a50b2cefee335af2f12eff770079ef5d7 (diff)
parent9b41a236b0162a863c8417119795481814eb3c01 (diff)
downloadprosody-57b4839a319c57177c831eeb1ca57eb51e1eb971.tar.gz
prosody-57b4839a319c57177c831eeb1ca57eb51e1eb971.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index a27b2b2d..acb0baeb 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -549,7 +549,7 @@ function streamopened(session, attr)
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