prosody
9c5d8e0c146e
core/s2smanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

core/s2smanager.lua @ 2714:9c5d8e0c146e

Merge with 0.6
author Matthew Wild <mwild1@gmail.com>
date Thu, 25 Feb 2010 18:03:15 +0000
parent 2676:4516888fc42d
parent 2712:9c579864b20a
child 2746:3b9547fc0bed
comparison
equal deleted inserted replaced
2708:d9c4ade80ae9 2714:9c5d8e0c146e
46 _G.prosody.incoming_s2s = incoming_s2s; 46 _G.prosody.incoming_s2s = incoming_s2s;
47 local incoming_s2s = incoming_s2s; 47 local incoming_s2s = incoming_s2s;
48 48
49 module "s2smanager" 49 module "s2smanager"
50 50
51 local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end 51 function compare_srv_priorities(a,b)
52 return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
53 end
52 54
53 local function bounce_sendq(session, reason) 55 local function bounce_sendq(session, reason)
54 local sendq = session.sendq; 56 local sendq = session.sendq;
55 if sendq then 57 if sendq then
56 session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host)); 58 session.log("info", "sending error replies for "..#sendq.." queued stanzas because of failed outgoing connection to "..tostring(session.to_host));