diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-07 16:52:18 +0200 |
| commit | 67c41ef89e175c064eca7d7518779aefed31c187 (patch) | |
| tree | 9043fbad3e9e1ac74e957347fedc8cca0a635106 /plugins/mod_s2s/mod_s2s.lua | |
| parent | 5ebf40bbffcbd1b50d76228307ade67863c3f586 (diff) | |
| parent | 36b9149295afd0c8b48e91c82ef0a1f8ebe7f932 (diff) | |
| download | prosody-67c41ef89e175c064eca7d7518779aefed31c187.tar.gz prosody-67c41ef89e175c064eca7d7518779aefed31c187.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_s2s/mod_s2s.lua')
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index c9b6b137..00e816f7 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -389,7 +389,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 |