aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/s2s/mod_s2s.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-24 16:25:45 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-24 16:25:45 +0000
commitb178521e828be9b8a92b6f4225df6036cdcdd5d1 (patch)
tree0fc9c99439149af544531ccd36cfeb50aabf0418 /plugins/s2s/mod_s2s.lua
parentb26626109f7bbe808303787f619b67cb64792269 (diff)
parentb51c0bea3f88b1bc58ffc83c3ec2b0ef6fc31235 (diff)
downloadprosody-b178521e828be9b8a92b6f4225df6036cdcdd5d1.tar.gz
prosody-b178521e828be9b8a92b6f4225df6036cdcdd5d1.zip
Merge backout
Diffstat (limited to 'plugins/s2s/mod_s2s.lua')
-rw-r--r--plugins/s2s/mod_s2s.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/s2s/mod_s2s.lua b/plugins/s2s/mod_s2s.lua
index f601a8a2..2573251f 100644
--- a/plugins/s2s/mod_s2s.lua
+++ b/plugins/s2s/mod_s2s.lua
@@ -247,7 +247,7 @@ function stream_callbacks.streamclosed(session)
end
function stream_callbacks.streamdisconnected(session, err)
- if err and err ~= "stream closed" then
+ if err and err ~= "closed" then
(session.log or log)("debug", "s2s connection attempt failed: %s", err);
if s2sout.attempt_connection(session, err) then
(session.log or log)("debug", "...so we're going to try another target");
@@ -255,7 +255,7 @@ function stream_callbacks.streamdisconnected(session, err)
end
end
(session.log or log)("info", "s2s disconnected: %s->%s (%s)", tostring(session.from_host), tostring(session.to_host), tostring(err or "closed"));
- if session.con then sessions[session.conn] = nil; else (session.log or log)("debug", "stale session's connection already closed"); end
+ sessions[session.conn] = nil;
s2s_destroy_session(session, err);
end