Diff

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
line wrap: on
line diff
--- a/core/s2smanager.lua	Thu Feb 25 02:01:00 2010 +0000
+++ b/core/s2smanager.lua	Thu Feb 25 18:03:15 2010 +0000
@@ -48,7 +48,9 @@
 
 module "s2smanager"
 
-local function compare_srv_priorities(a,b) return a.priority < b.priority or a.weight < b.weight; end
+function compare_srv_priorities(a,b)
+	return a.priority < b.priority or (a.priority == b.priority and a.weight > b.weight);
+end
 
 local function bounce_sendq(session, reason)
 	local sendq = session.sendq;