From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 30 Oct 2017 09:57:40 +0000 (+0000)
Subject: builders: Show correct job queue
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e5c863717c49c749bab438a038487fcf812db69;p=pbs.git

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 861e324e..96a0efcd 100644
--- 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 b60c2864..c8f610d4 100644
--- 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)