builders: Show correct job queue

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 861e324e2651f6370881a9c9544e3650f41dbd9b..96a0efcd287a6c056014d6bc21080b65282750fe 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -351,8 +351,12 @@ class Builder(base.DataObject):
                return "online"
 
        @lazy_property
-       def active_jobs(self, *args, **kwargs):
-               return self.pakfire.jobs.get_active(builder=self, *args, **kwargs)
+       def active_jobs(self):
+               jobs = self.backend.jobs._get_jobs("SELECT jobs.* FROM jobs \
+                       WHERE time_started IS NOT NULL AND time_finished IS NULL \
+                       AND builder_id = %s ORDER BY time_started", self.id)
+
+               return list(jobs)
 
        @property
        def too_many_jobs(self):

diff --git a/src/web/builders.py b/src/web/builders.py
index b60c2864a83d037e4dec798f864ae9d65c933bd7..c8f610d4254466af78eb3134846876f23fc6fbd3 100644 (file)
--- a/src/web/builders.py
+++ b/src/web/builders.py
@@ -14,8 +14,7 @@ class BuilderDetailHandler(base.BaseHandler):
                builder = self.backend.builders.get_by_name(hostname)
 
                # Get running and pending jobs.
-               jobs = self.backend.jobs.get_active(builder=builder)
-               jobs += builder.jobqueue
+               jobs = builder.active_jobs + list(builder.jobqueue)
 
                # Get log.
                log = builder.get_history(limit=5)