[frontend] support for import (copr-dist-git per-task) logs

fedora-copr · Mar 8, 2016 · 7623ba5 · 7623ba5
1 parent 9e53dd6
commit 7623ba5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 2 deletions.
diff --git a/frontend/coprs_frontend/config/copr.conf b/frontend/coprs_frontend/config/copr.conf
@@ -79,6 +79,7 @@ SEND_EMAILS = True
 PUBLIC_COPR_HOSTNAME = "copr.fedoraproject.org"
 
 DIST_GIT_URL = "http://copr-dist-git-dev.fedorainfracloud.org/cgit/"
+COPR_DIST_GIT_LOGS_URL = "http://copr-dist-git-dev.fedorainfracloud.org/per-task-logs"
 
 # primary
 LOG_FILENAME = "/var/log/copr/frontend.log"

diff --git a/frontend/coprs_frontend/config/copr_devel.conf b/frontend/coprs_frontend/config/copr_devel.conf
@@ -44,6 +44,7 @@ ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http"
 PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org"
 
 DIST_GIT_URL = "http://copr-dist-git-dev.fedorainfracloud.org/cgit/"
+COPR_DIST_GIT_LOGS_URL = "http://copr-dist-git-dev.fedorainfracloud.org/per-task-logs"
 
 LOG_FILENAME="/tmp/copr_frontend.log"
 

diff --git a/frontend/coprs_frontend/coprs/config.py b/frontend/coprs_frontend/coprs/config.py
@@ -42,6 +42,7 @@ class Config(object):
     PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org"
 
     DIST_GIT_URL = None
+    COPR_DIST_GIT_LOGS_URL = None
 
     # primary log file
     LOG_FILENAME = "/var/log/copr/frontend.log"

diff --git a/frontend/coprs_frontend/coprs/models.py b/frontend/coprs_frontend/coprs/models.py
@@ -821,6 +821,14 @@ def state(self):
 
         return "unknown"
 
+    @property
+    def task_id(self):
+        return "{}-{}".format(self.build_id, self.name)
+
+    @property
+    def import_task_id(self):
+        return "{}-{}".format(self.build_id, helpers.chroot_to_branch(self.name))
+
     @property
     def dist_git_url(self):
         if app.config["DIST_GIT_URL"]:
@@ -829,6 +837,13 @@ def dist_git_url(self):
                                                     self.git_hash)
         return None
 
+    @property
+    def import_log_url(self):
+        if app.config["COPR_DIST_GIT_LOGS_URL"]:
+            return "{}/{}.log".format(app.config["COPR_DIST_GIT_LOGS_URL"],
+                                      self.import_task_id)
+        return None
+
     @property
     def result_dir_url(self):
         return "/".join([app.config["BACKEND_BASE_URL"],

diff --git a/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html b/frontend/coprs_frontend/coprs/templates/coprs/detail/build.html
@@ -146,6 +146,7 @@ <h3 class="panel-title">Results</h3>
             <tr>
               <th>Chroot Name</th>
               <th>Dist Git Source</th>
+              <th>Import log</th>
               <th>Build Time</th>
               <th>State</th>
             </tr>
@@ -176,6 +177,15 @@ <h3 class="panel-title">Results</h3>
                   -
                 {% endif %}
               </td>
+              <td>
+                {% if chroot.import_log_url %}
+                    <a href="{{chroot.import_log_url}}">
+                      {{ chroot.import_task_id }}.log
+                    </a>
+                {% else %}
+                  -
+                {% endif %}
+              </td>
               <td>
                 {{ chroot.started_on|time_ago(chroot.ended_on) }}
               </td>

diff --git a/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py b/frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
@@ -36,7 +36,7 @@ def dist_git_importing_queue():
         else:
             user_name = copr.owner.name
         task_dict = {
-            "task_id": "{}-{}".format(task.build.id, helpers.chroot_to_branch(task.mock_chroot.name)),
+            "task_id": task.import_task_id,
             "user": user_name,
             "project": task.build.copr.name,
 
@@ -143,7 +143,7 @@ def waiting():
                 user_name = copr.owner.name
 
             record = {
-                "task_id": "{}-{}".format(task.build.id, task.mock_chroot.name),
+                "task_id": task.task_id,
                 "build_id": task.build.id,
                 "project_owner": user_name,
                 "project_name": task.build.copr.name,