[rhmessaging-commits] rhmessaging commits: r2510 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-09-20 21:29:04 -0400 (Sat, 20 Sep 2008)
New Revision: 2510

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
   mgmt/trunk/cumin/python/cumin/job.strings
Log:
Don't show 'idle' objects

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2008-09-21 01:05:25 UTC (rev 2509)
+++ mgmt/trunk/cumin/python/cumin/job.py	2008-09-21 01:29:04 UTC (rev 2510)
@@ -1260,14 +1260,18 @@
     def get_sql_constraint(self, session):
         phase = self.get(session)
 
+        alive = "((c.rec_time is null or " + \
+            "c.rec_time <= now() - interval '10 minutes')" + \
+            " and j.deletion_time is null)"
+
         if phase == "a":
-            sql = "j.deletion_time is null"
+            sql = alive
         elif phase == "r":
             sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Running") + \
-                    " and j.deletion_time is null)"
+                    " and %s)" % alive
         elif phase == "h":
             sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Held") + \
-                    " and j.deletion_time is null)"
+                    " and %s)" % alive
         else:
             sql = "j.deletion_time is not null"
 

Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings	2008-09-21 01:05:25 UTC (rev 2509)
+++ mgmt/trunk/cumin/python/cumin/job.strings	2008-09-21 01:29:04 UTC (rev 2510)
@@ -25,6 +25,8 @@
 [JobSet.count_sql]
 select count(1) 
 from job as j
+left outer join job_stats as c on c.id = j.stats_curr_id
+left outer join job_stats as p on p.id = j.stats_prev_id
 inner join scheduler as s on s.id = j.scheduler_id
 {sql_where}