web: Drop another queue view

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

diff --git a/Makefile.am b/Makefile.am
index 740f61f2c6bddcd2a67d86bd2b2e76f1a1e92ee2..f650e050621c1f8164b0dd76805807a8403e14d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,7 +155,6 @@ dist_templates_DATA = \
        src/templates/build-list.html \
        src/templates/build-manage.html \
        src/templates/build-priority.html \
-       src/templates/build-queue.html \
        src/templates/build-schedule-test.html \
        src/templates/build-state.html \
        src/templates/builds-watchers-add.html \

diff --git a/src/buildservice/jobqueue.py b/src/buildservice/jobqueue.py
index b97c3a17fbfe9e553dd76bff7db105283241a1fe..139cd965a01ad4b2c4ec369ce3c2335703f16518 100644 (file)
--- a/src/buildservice/jobqueue.py
+++ b/src/buildservice/jobqueue.py
@@ -39,16 +39,6 @@ class JobQueue(base.Object):
                        builder.supported_arches,
                )
 
-       @property
-       def average_waiting_time(self):
-               """
-                       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 job_queue queue LEFT JOIN jobs ON queue.job_id = jobs.id")
-
-               return res.avg
-
        def check_build_dependencies(self):
                # Check all jobs that have never being checked before
                self._check_build_dependencies("SELECT * FROM jobs \

diff --git a/src/templates/build-queue.html b/src/templates/build-queue.html
deleted file mode 100644 (file)
index c302779..0000000
--- a/src/templates/build-queue.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ _("Builds") }} - {{ _("Job queue") }}{% end block %}
-
-{% block body %}
-       <h1>{{ _("Builds") }}: {{ _("Job queue") }}</h1>
-       <p>
-               {{ _("This is a list of all jobs that are waiting to be processed.") }}
-               {{ _("They one at the top is next.") }}
-       </p>
-
-       {{ _("Average waiting time: %s") % format_time(average_waiting_time.total_seconds()) }}
-
-       {% if jobs %}
-               {% module JobsList(jobs) %}
-       {% else %}
-               {{ _("No jobs to do.") }}
-       {% end %}
-{% end %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 94ee62bb7de47a72920b6e7a87cbb0486c36ae7d..d12726a0fde59443c62d15a3544557d7d7caa312 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -128,7 +128,6 @@ class Application(tornado.web.Application):
 
                        # Builds
                        (r"/builds", builds.BuildsHandler),
-                       (r"/builds/queue", builds.BuildQueueHandler),
                        (r"/builds/comments", builds.BuildsCommentsHandler),
                        (r"/builds/comments/(\w+)", builds.BuildsCommentsHandler),
                        (r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.BuildDetailHandler),

diff --git a/src/web/builds.py b/src/web/builds.py
index 65d8ff035a8103bd65ee4d7ec2c4f9af90b3cd65..efcf2843b549183b87f9fbee5ab52b4fc5066cfe 100644 (file)
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -196,12 +196,6 @@ class BuildStateHandler(base.BaseHandler):
                self.redirect("/build/%s" % build.uuid)
 
 
-class BuildQueueHandler(base.BaseHandler):
-       def get(self):
-               self.render("build-queue.html", jobs=self.backend.jobqueue,
-                       average_waiting_time=self.backend.jobqueue.average_waiting_time)
-
-
 class BuildDetailCommentHandler(base.BaseHandler):
        @tornado.web.authenticated
        def post(self, uuid):