From: Michael Tremer Date: Sun, 29 May 2022 12:43:24 +0000 (+0000) Subject: jobs: Fix name of job queue view X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c35aa4452a3dfd9c32593f761b1aa50d6a74f1c;p=pbs.git jobs: Fix name of job queue view Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/jobqueue.py b/src/buildservice/jobqueue.py index 60b73666..a46d3771 100644 --- a/src/buildservice/jobqueue.py +++ b/src/buildservice/jobqueue.py @@ -12,13 +12,13 @@ PENDING_STATE = "pending" class JobQueue(base.Object): def __iter__(self): - jobs = self.backend.jobs._get_jobs("SELECT jobs.* FROM jobs_queue queue \ + jobs = self.backend.jobs._get_jobs("SELECT jobs.* FROM job_queue queue \ LEFT JOIN jobs ON queue.job_id = jobs.id") return iter(jobs) def __len__(self): - res = self.db.get("SELECT COUNT(*) AS len FROM jobs_queue") + res = self.db.get("SELECT COUNT(*) AS len FROM job_queue") return res.len @@ -40,7 +40,7 @@ class JobQueue(base.Object): ) def get_length_for_arch(self, arch): - res = self.db.get("SELECT COUNT(*) AS len FROM jobs_queue queue \ + res = self.db.get("SELECT COUNT(*) AS len FROM job_queue queue \ LEFT JOIN jobs on queue.job_id = jobs.id \ WHERE jobs.arch = %s", arch) @@ -52,7 +52,7 @@ class JobQueue(base.Object): Returns how long the jobs in the queue have been waiting on average """ res = self.db.get("SELECT AVG(NOW() - COALESCE(jobs.start_not_before, jobs.time_created)) AS avg \ - FROM jobs_queue queue LEFT JOIN jobs ON queue.job_id = jobs.id") + FROM job_queue queue LEFT JOIN jobs ON queue.job_id = jobs.id") return res.avg diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index ab0ea4cc..462fc9d3 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -178,7 +178,7 @@ class Job(base.DataObject): if not self.state == "pending": return - res = self.db.get("SELECT rank FROM jobs_queue WHERE job_id = %s", self.id) + res = self.db.get("SELECT rank FROM job_queue WHERE job_id = %s", self.id) if res: return res.rank