From: Michael Tremer Date: Wed, 25 Oct 2017 17:10:29 +0000 (+0100) Subject: Drop useless statistics page X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11edaf9502f44c533c686e7d228e09435154d843;p=pbs.git Drop useless statistics page Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 21797e15..22f745f3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,11 +328,6 @@ dist_templates_sessions_DATA = \ templates_sessionsdir = $(templatesdir)/sessions -dist_templates_statistics_DATA = \ - src/templates/statistics/index.html - -templates_statisticsdir = $(templatesdir)/statistics - # ------------------------------------------------------------------------------ # dist_static_DATA = \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 8745dcd2..e9682c8b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -142,7 +142,6 @@ src/templates/search-form.html src/templates/search-results.html src/templates/sessions/index.html src/templates/source-list.html -src/templates/statistics/index.html src/templates/updates-index.html src/templates/uploads-list.html src/templates/user-comments.html diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index fcb6792b..7715abb5 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -141,11 +141,6 @@ class Builds(base.Object): return builds - def count(self): - builds = self.db.get("SELECT COUNT(*) AS count FROM builds") - if builds: - return builds.count - def get_obsolete(self, repo=None): """ Get all obsoleted builds. diff --git a/src/buildservice/jobs.py b/src/buildservice/jobs.py index 2a3b493d..1713d244 100644 --- a/src/buildservice/jobs.py +++ b/src/buildservice/jobs.py @@ -117,30 +117,6 @@ class Jobs(base.Object): return [Job(self.backend, j.id, j) for j in self.db.query(query, *args)] - def get_average_build_time(self): - """ - Returns the average build time of all finished builds from the - last 3 months. - """ - result = self.db.get("SELECT AVG(time_finished - time_started) as average \ - FROM jobs WHERE type = 'build' AND state = 'finished' AND \ - time_finished >= NOW() - '3 months'::interval") - - if result: - return result.average - - def count(self, *states): - query = "SELECT COUNT(*) AS count FROM jobs" - args = [] - - if states: - query += " WHERE state IN %s" - args.append(states) - - jobs = self.db.get(query, *args) - if jobs: - return jobs.count - def restart_failed(self): jobs = self._get_jobs("SELECT jobs.* FROM jobs \ JOIN builds ON builds.id = jobs.build_id \ diff --git a/src/templates/base.html b/src/templates/base.html index 9ac8eed9..28423df0 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -88,13 +88,6 @@ {% end %} -
  • - - - {{ _("Statistics") }} - -
    • - {% if current_user and current_user.is_admin() %}
  • diff --git a/src/templates/statistics/index.html b/src/templates/statistics/index.html deleted file mode 100644 index 312a87ee..00000000 --- a/src/templates/statistics/index.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Statistics") }}{% end block %} - -{% block body %} -
    -

    {{ _("Statistics") }}

    -
    - -

    - {{ _("On this page, you will find a lot of information bundled in graphs and figures.") }} - {{ _("They give a very quick overview about what is going on in the build service.") }} -

    - -

    {{ _("Builds") }}

    -
      -
    • - {{ _("The average build time is %.1f minutes.") % (jobs_avg_build_time / 60) }} -
      • -
    • - {{ _("There are %(builds_count)s builds containing %(jobs_count_all)s jobs.") % { "builds_count" : builds_count, "jobs_count_all" : jobs_count_all } }} -
      • -
    -{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 99ef809b..9b3b9b3f 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -213,9 +213,6 @@ class Application(tornado.web.Application): (r"/key/([A-Z0-9]+)", KeysDownloadHandler), (r"/key/([A-Z0-9]+)/delete", KeysDeleteHandler), - # Statistics - (r"/statistics", StatisticsMainHandler), - # Documents (r"/documents", DocsIndexHandler), (r"/documents/builds", DocsBuildsHandler), diff --git a/src/web/handlers.py b/src/web/handlers.py index 99b35e6f..9e87889d 100644 --- a/src/web/handlers.py +++ b/src/web/handlers.py @@ -37,24 +37,6 @@ class Error404Handler(BaseHandler): raise tornado.web.HTTPError(404) -class StatisticsMainHandler(BaseHandler): - def get(self): - args = {} - - # Build statistics. - args.update({ - "builds_count" : self.pakfire.builds.count(), - }) - - # Job statistics. - args.update({ - "jobs_count_all" : self.pakfire.jobs.count(), - "jobs_avg_build_time" : self.pakfire.jobs.get_average_build_time(), - }) - - self.render("statistics/index.html", **args) - - class UploadsHandler(BaseHandler): @tornado.web.authenticated def get(self):