Remove builders load progress bar

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

diff --git a/Makefile.am b/Makefile.am
index c0786fddb87f577196ddd8ca2821cb24d46ee211..10bf97eafb51bb008212864a5929adac99d00ae9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -286,11 +286,6 @@ dist_templates_modules_DATA = \
 
 templates_modulesdir = $(templatesdir)/modules
 
-dist_templates_modules_builders_DATA = \
-       src/templates/modules/builders/load.html
-
-templates_modules_buildersdir = $(templates_modulesdir)/builders
-
 dist_templates_modules_changelog_DATA = \
        src/templates/modules/changelog/entry.html \
        src/templates/modules/changelog/index.html

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9ee6590284122fbaa41015f596464308c87da53f..8745dcd2f25be80e4f64dfa2492873527e5de6eb 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -84,7 +84,6 @@ src/templates/mirrors/edit.html
 src/templates/mirrors/list.html
 src/templates/mirrors/new.html
 src/templates/modules/bugs-table.html
-src/templates/modules/builders/load.html
 src/templates/modules/build-headline.html
 src/templates/modules/build-log.html
 src/templates/modules/build-offset.html

diff --git a/src/buildservice/builders.py b/src/buildservice/builders.py
index 942d546ec1556261a7a0d1419a8678914339a24a..d10fc7c6392fdf3924389634e1e16962ccc80d29 100644 (file)
--- a/src/buildservice/builders.py
+++ b/src/buildservice/builders.py
@@ -76,18 +76,6 @@ class Builders(base.Object):
                return self._get_builder("SELECT * FROM builders \
                        WHERE name = %s AND deleted IS FALSE", name)
 
-       def get_load(self):
-               res1 = self.db.get("SELECT SUM(max_jobs) AS max_jobs FROM builders \
-                       WHERE enabled IS TRUE and deleted IS FALSE")
-
-               res2 = self.db.get("SELECT COUNT(*) AS count FROM jobs \
-                       WHERE state = 'dispatching' OR state = 'running' OR state = 'uploading'")
-
-               try:
-                       return (res2.count * 100 / res1.max_jobs)
-               except:
-                       return 0
-
        def get_history(self, limit=None, offset=None, builder=None, user=None):
                query = "SELECT * FROM builders_history"
                args  = []

diff --git a/src/templates/builders/list.html b/src/templates/builders/list.html
index 596dd45e9f982b2572829d61ba956750a06d78c8..cf6ac190711d18d9f8d49f6b4584f856eb59196f 100644 (file)
--- a/src/templates/builders/list.html
+++ b/src/templates/builders/list.html
@@ -17,10 +17,6 @@
                <h2>{{ _("Builders") }}</h2>
        </div>
 
-       {% module BuildersLoad() %}
-
-       <hr>
-
        <div class="row">
                <div class="span12">
                        <table class="table table-striped table-hover">

diff --git a/src/templates/modules/builders/load.html b/src/templates/modules/builders/load.html
deleted file mode 100644 (file)
index 4a3b292..0000000
--- a/src/templates/modules/builders/load.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="well well-white">
-       <h5>{{ _("Current load of the build cluster") }}</h5>
-
-       <div class="row-fluid">
-               <div class="span10">
-                       <div class="progress progress-striped active">
-                               {% if load >= 90 %}
-                                       <div class="bar bar-danger" style="width: {{ "%.2f%%" % load }};"></div>
-                               {% elif load >= 50 %}
-                                       <div class="bar bar-warning" style="width: {{ "%.2f%%" % load }};"></div>
-                               {% else %}
-                                       <div class="bar bar-success" style="width: {{ "%.2f%%" % load }};"></div>
-                               {% end %}
-                       </div>
-               </div>
-
-               <div class="span2">
-                       <p class="lead ac">{{ "%.0f%%" % load }}</p>
-               </div>
-       </div>
-</div>

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 8bcd6896e31f562e4db1a2b0ea0dc44ce7f71bd7..2ac913336a1db3fa75ed4d29d685710e43bc29ff 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -42,9 +42,6 @@ class Application(tornado.web.Application):
                                "LogEntry"           : ui_modules.LogEntryModule,
                                "LogEntryComment"    : ui_modules.LogEntryCommentModule,
 
-                               # Builders
-                               "BuildersLoad"       : ui_modules.BuildersLoadModule,
-
                                "BuildHeadline"      : ui_modules.BuildHeadlineModule,
                                "BuildStateWarnings" : ui_modules.BuildStateWarningsModule,
 

diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index f7cb435033bd99757dcc4e9b42dfdba893bba0ef..88b8070972eca0dd70decb055a5d3c941123ff62 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -98,13 +98,6 @@ class JobsStatusModule(UIModule):
                        build=build, jobs=build.jobs)
 
 
-class BuildersLoadModule(UIModule):
-       def render(self):
-               load = self.backend.builders.get_load()
-
-               return self.render_string("modules/builders/load.html", load=load)
-
-
 class BugsTableModule(UIModule):
        def render(self, pkg, bugs):
                return self.render_string("modules/bugs-table.html",