jobs: Fix dedicated log streaming page

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

diff --git a/src/templates/jobs/log-stream.html b/src/templates/jobs/log-stream.html
index c9820d921960b3afba890cfccd08d93d65726b1d..90945fdff06f9eacf458441a20eb4ba6514f394a 100644 (file)
--- a/src/templates/jobs/log-stream.html
+++ b/src/templates/jobs/log-stream.html
@@ -1,24 +1,30 @@
 {% extends "base.html" %}
 
+{% from "jobs/macros.html" import JobLogStream with context %}
+
 {% block title %}{{ job }} - {{ _("Log") }}{% endblock %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/builds">{{ _("Builds") }}</a>
-                       </li>
-                       <li>
-                               <a href="/builds/{{ job.build.uuid }}">{{ job.build }}</a>
-                       </li>
-                       <li>
-                               <a href="#" disabled>{{ job.arch }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ _("Log") }}</a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/builds">{{ _("Builds") }}</a>
+                                       </li>
+                                       <li>
+                                               <a href="/builds/{{ job.build.uuid }}">{{ job.build }}</a>
+                                       </li>
+                                       <li>
+                                               <a href="#" disabled>{{ job.arch }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ _("Log") }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       {{ JobLogStream(job) }}
+                       {{ JobLogStream(job) }}
+               </div>
+       </section>
 {% endblock %}

diff --git a/src/web/jobs.py b/src/web/jobs.py
index cf6235895154e5a419eea779f9dad5a87b807750..4d2b13690db8a23c34969e8c70c40ae8ef1e3b8d 100644 (file)
--- a/src/web/jobs.py
+++ b/src/web/jobs.py
@@ -153,8 +153,7 @@ class LogHandler(base.BaseHandler):
 
                # Stream the log if the job is running
                if job.is_running():
-                       self.render("jobs/log-stream.html", job=job)
-                       return
+                       return await self.render("jobs/log-stream.html", job=job)
 
                # Set Content-Type header
                self.set_header("Content-Type", "text/plain")