Mercurial > prosody-hg
comparison plugins/mod_s2s/mod_s2s.lua @ 6473:7c8f58d2b331
Merge 0.9->0.10
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 10:59:27 +0100 |
| parents | e5945fb5b71f 95d93c4f9d40 |
| children | 61b6a4fc65f1 64e6b88b6b21 |
comparison
equal
deleted
inserted
replaced
| 6470:67501b5576d3 | 6473:7c8f58d2b331 |
|---|---|
| 45 | 45 |
| 46 local bouncy_stanzas = { message = true, presence = true, iq = true }; | 46 local bouncy_stanzas = { message = true, presence = true, iq = true }; |
| 47 local function bounce_sendq(session, reason) | 47 local function bounce_sendq(session, reason) |
| 48 local sendq = session.sendq; | 48 local sendq = session.sendq; |
| 49 if not sendq then return; end | 49 if not sendq then return; end |
| 50 session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host)); | 50 session.log("info", "Sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host)); |
| 51 local dummy = { | 51 local dummy = { |
| 52 type = "s2sin"; | 52 type = "s2sin"; |
| 53 send = function(s) | 53 send = function(s) |
| 54 (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", traceback()); | 54 (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", traceback()); |
| 55 end; | 55 end; |
