From 4ee28b411fa819a420926b8a6e60be043fdb1d2e Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 17 Apr 2009 19:50:11 +0000
Subject: add priority to job queue so billing jobs don't don't drown out
 provisioning jobs

---
 FS/bin/freeside-queued | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'FS/bin')

diff --git a/FS/bin/freeside-queued b/FS/bin/freeside-queued
index d4f09c18d..8c07638b3 100644
--- a/FS/bin/freeside-queued
+++ b/FS/bin/freeside-queued
@@ -84,9 +84,12 @@ while (1) {
   my $nodepend = 'AND 0 = ( SELECT COUNT(*) FROM queue_depend'.
                  '           WHERE queue_depend.jobnum = queue.jobnum )';
 
-  my $order_by = "ORDER BY jobnum ". ( driver_name eq 'mysql'
-                                         ? 'LIMIT 1 FOR UPDATE'
-                                         : 'FOR UPDATE LIMIT 1' );
+  #anything with a priority goes after stuff without one
+  my $order_by = ' ORDER BY COALESCE(priority,0) ASC, jobnum ASC ';
+
+  $order_by .= ( driver_name eq 'mysql'
+                   ? ' LIMIT 1 FOR UPDATE '
+                   : ' FOR UPDATE LIMIT 1 ' );
 
   my $job = qsearchs({
     'table'     => 'queue',
-- 
cgit v1.2.1