From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 31 May 2022 16:12:01 +0000 (+0000)
Subject: jobs: Drop queue per architecture
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c01b6e5e8f82ab28217015ffdd7e0def4f2a2dc;p=pbs.git

jobs: Drop queue per architecture

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

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 0d5c1898..649cb127 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -143,8 +143,7 @@ class Application(tornado.web.Application):
 			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/watchers", builds.BuildWatchersHandler),
 			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/delete", builds.BuildDeleteHandler),
 
-			(r"/queue", jobs.ShowQueueHandler),
-			(r"/queue/([\w_]+)", jobs.ShowQueueHandler),
+			(r"/queue", jobs.QueueHandler),
 
 			# Jobs
 			(r"/job/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", jobs.JobDetailHandler),
diff --git a/src/web/jobs.py b/src/web/jobs.py
index 162e22a2..c483ab3b 100644
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -4,17 +4,9 @@ import tornado.web
 
 from . import base
 
-class ShowQueueHandler(base.BaseHandler):
-	def get(self, arch=None):
-		if arch:
-			if not self.backend.arches.exists(arch):
-				raise tornado.web.HTTPError(400, "Architecture does not exist")
-
-			queue = self.backend.jobqueue.for_arches([arch, "noarch"])
-		else:
-			queue = self.backend.jobqueue
-
-		self.render("queue.html", arch=arch, queue=queue)
+class QueueHandler(base.BaseHandler):
+	def get(self):
+		self.render("queue.html", queue=self.backend.jobqueue)
 
 
 class JobDetailHandler(base.BaseHandler):