diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-02-24 16:25:45 +0000 |
| commit | 9de25d7789ed5974d66a396aa1c5908e7d74bf29 (patch) | |
| tree | 0fc9c99439149af544531ccd36cfeb50aabf0418 | |
| parent | 07151a029c71a7d868003f5ab3c76d4e9812eb2d (diff) | |
| parent | dc4689b625060e77b2c555e71e353719b48d5401 (diff) | |
| download | prosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.tar.gz prosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.zip | |
Merge backout
| -rw-r--r-- | plugins/s2s/mod_s2s.lua | 4 |
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 |