aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-09-28 14:45:02 +0200
committerKim Alvefur <zash@zash.se>2016-09-28 14:45:02 +0200
commit70ba6bf40f1ab1ae43a120c4281970afb699e275 (patch)
tree55ddb0dd0e5662805f2f159a7cb045c5664b5b73 /plugins
parentd56bd9dbdb87be04aafc1ea632e1a238cb62aee1 (diff)
parent98df7c1fb7b94934ba4615606609bd7061396343 (diff)
downloadprosody-70ba6bf40f1ab1ae43a120c4281970afb699e275.tar.gz
prosody-70ba6bf40f1ab1ae43a120c4281970afb699e275.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index d190d631..67af6a14 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -373,7 +373,7 @@ function stream_callbacks.streamopened(session, attr)
elseif session.direction == "outgoing" then
session.notopen = nil;
if not attr.id then
- log("error", "Stream response from %s did not give us a stream id!", session.to_host);
+ log("warn", "Stream response did not give us a stream id!");
session:close({ condition = "undefined-condition", text = "Missing stream ID" });
return;
end