From 1f0a8c9cbc7c0ef504ca8ea848f755732b384235 Mon Sep 17 00:00:00 2001 From: clime Date: Sep 17 2017 17:11:15 +0000 Subject: [frontend] fix 'Repo Downloads' counter --- diff --git a/frontend/coprs_frontend/coprs/logic/stat_logic.py b/frontend/coprs_frontend/coprs/logic/stat_logic.py index cc54761..6d451d8 100644 --- a/frontend/coprs_frontend/coprs/logic/stat_logic.py +++ b/frontend/coprs_frontend/coprs/logic/stat_logic.py @@ -95,10 +95,6 @@ def handle_logstash(rc, ls_data): return tags = set(ls_data["tags"]) - if "frontend" in tags and "repo_dl": - name = REPO_DL_STAT_FMT.format(**ls_data) - CounterStatLogic.incr(name=name, counter_type=CounterStatType.REPO_DL) - db.session.commit() if "backend" in tags and "repomdxml" in tags: if "copr_user" in ls_data: diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 65573a0..76872ad 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -45,8 +45,7 @@ from coprs.views.groups_ns import groups_ns from coprs.logic import builds_logic, coprs_logic, actions_logic, users_logic from coprs.helpers import parse_package_name, generate_repo_url, CHROOT_RPMS_DL_STAT_FMT, CHROOT_REPO_MD_DL_STAT_FMT, \ - str2bool, url_for_copr_view - + str2bool, url_for_copr_view, REPO_DL_STAT_FMT, CounterStatType def url_for_copr_details(copr): return url_for_copr_view( @@ -803,6 +802,15 @@ def render_generate_repo_file(copr, name_release): response.mimetype = "text/plain" response.headers["Content-Disposition"] = \ "filename={0}.repo".format(copr.repo_name) + + name = REPO_DL_STAT_FMT.format(**{ + 'copr_user': copr.user.name, + 'copr_project_name': copr.name, + 'copr_name_release': name_release, + }) + CounterStatLogic.incr(name=name, counter_type=CounterStatType.REPO_DL) + db.session.commit() + return response