Drop statistics handlers

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

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 16bf2d5600785591478f333c81e657e2b1e4e62e..df57fec9dfcf872880b586029c06b74dd145cdc4 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -389,18 +389,6 @@ class Builds(base.Object):
                if build_times:
                        return build_times[0]
 
-       def get_types_stats(self):
-               res = self.db.query("SELECT type, COUNT(*) AS count FROM builds GROUP BY type")
-
-               if not res:
-                       return {}
-
-               ret = {}
-                for row in res:
-                        ret[row.type] = row.count
-
-               return ret
-
 
 class Build(base.Object):
        def __init__(self, pakfire, id, data=None):
@@ -1491,31 +1479,6 @@ class Jobs(base.Object):
                if jobs:
                        return jobs.count
 
-       def get_state_stats(self):
-               res = self.db.query("SELECT state, COUNT(*) AS count FROM jobs GROUP BY state")
-
-               if not res:
-                       return {}
-
-               ret = {
-                       "new"              : 0,
-                       "pending"          : 0,
-                       "running"          : 0,
-                       "finished"         : 0,
-                       "dispatching"      : 0,
-                       "uploading"        : 0,
-                       "failed"           : 0,
-                       "aborted"          : 0,
-                       "temporary_failed" : 0,
-                       "dependency_error" : 0,
-                       "download_error"   : 0,
-                       "deleted"          : 0,
-               }
-               for row in res:
-                       ret[row.state] = int(row.count)
-
-               return ret
-
 
 class Job(base.DataObject):
        table = "jobs"

diff --git a/src/hub/__init__.py b/src/hub/__init__.py
index 0576d18b3a81ac7c54a69876b9585fbf68b175c0..0df68a5a911ed0b782e8bb9633f237bf69c7bb50 100644 (file)
--- a/src/hub/__init__.py
+++ b/src/hub/__init__.py
@@ -38,11 +38,6 @@ class Application(tornado.web.Application):
                        (r"/error/test", handlers.ErrorTestHandler),
                        (r"/error/test/(\d+)", handlers.ErrorTestHandler),
 
-                       # Statistics
-                       (r"/statistics/builds/types", handlers.StatsBuildsTypesHandler),
-                       (r"/statistics/jobs/queue", handlers.StatsJobsQueueHandler),
-                       (r"/statistics/jobs/states", handlers.StatsJobsStatesHandler),
-
                        # Builds
                        (r"/builds/create", handlers.BuildsCreateHandler),
                        (r"/builds/(.*)", handlers.BuildsGetHandler),

diff --git a/src/hub/handlers.py b/src/hub/handlers.py
index d38ebc0ec1758ce8263b554526e85311cba34404..a117bde6a5982cd863b776011a977615b675f8ab 100644 (file)
--- a/src/hub/handlers.py
+++ b/src/hub/handlers.py
@@ -135,48 +135,6 @@ class ErrorTestHandler(BaseHandler):
                raise tornado.web.HTTPError(error_code)
 
 
-class StatsBuildsTypesHandler(BaseHandler):
-       def get(self):
-               ret = {}
-
-               types = self.backend.builds.get_types_stats()
-               for type, count in types.items():
-                       ret["builds_type_%s" % type] = count
-
-               self.write(ret)
-
-
-class StatsJobsHandler(BaseHandler):
-       def get(self):
-               ret = {}
-
-               self.write(ret)
-
-
-class StatsJobsStatesHandler(BaseHandler):
-       def get(self):
-               ret = {}
-
-               states = self.backend.jobs.get_state_stats()
-               for state, count in states.items():
-                       ret["jobs_state_%s" % state] = count
-
-               self.write(ret)
-
-
-class StatsJobsQueueHandler(BaseHandler):
-       def get(self):
-               ret = {}
-
-               # Queue length(s).
-               ret["job_queue_length"] = len(self.backend.jobqueue)
-
-               # Average waiting time.
-               ret["job_queue_avg_wait_time"] = self.backend.jobqueue.average_waiting_time
-
-               self.write(ret)
-
-
 # Uploads
 
 class UploadsCreateHandler(BaseHandler):

diff --git a/src/templates/build-queue.html b/src/templates/build-queue.html
index b970110a1bd8e9dbfbd91d9b81d41f457d706a43..c302779661b32d3f9413905747ef755e4057d9d9 100644 (file)
--- a/src/templates/build-queue.html
+++ b/src/templates/build-queue.html
@@ -9,6 +9,8 @@
                {{ _("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 %}

diff --git a/src/web/handlers_builds.py b/src/web/handlers_builds.py
index 3db8f96a7f0d7568567a687a80f161c49fc343f5..3afc3ca8abf7b80b0a259e53399fd8537c0c2f18 100644 (file)
--- a/src/web/handlers_builds.py
+++ b/src/web/handlers_builds.py
@@ -196,7 +196,8 @@ class BuildStateHandler(BaseHandler):
 
 class BuildQueueHandler(BaseHandler):
        def get(self):
-               self.render("build-queue.html", jobs=self.backend.jobqueue)
+               self.render("build-queue.html", jobs=self.backend.jobqueue,
+                       average_waiting_time=self.backend.jobqueue.average_waiting_time)
 
 
 class BuildDetailCommentHandler(BaseHandler):