From 4de78dd625636f0b25330db84af6362b79640903 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Michel=20Nirgal=20Vourg=C3=A8re?= Date: Tue, 19 Apr 2011 15:55:06 +0000 Subject: [PATCH] New /job/JOBID/log url to see job logs --- bin/djais/views.py | 4 ++-- www_templates/job_log.html | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 www_templates/job_log.html diff --git a/bin/djais/views.py b/bin/djais/views.py index e82a9fc..7f29e43 100644 --- a/bin/djais/views.py +++ b/bin/djais/views.py @@ -928,11 +928,11 @@ def job_log(request, jobid): return HttpResponseForbidden('403 Forbidden') log = u'' try: - log = file(RESULT_DIR+unicode(jobid)+'.log').read() + log = file(jobrunner.RESULT_DIR+unicode(jobid)+'.log').read() except IOError, err: if err.errno != 2: # No such file raise - return render_to_response('job.html', {'job': job, 'log': log}, RequestContext(request)) + return render_to_response('job_log.html', {'job': job, 'log': log}, RequestContext(request)) @http_authenticate(auth, 'ais') diff --git a/www_templates/job_log.html b/www_templates/job_log.html new file mode 100644 index 0000000..94e8744 --- /dev/null +++ b/www_templates/job_log.html @@ -0,0 +1,20 @@ +{% extends "jobs.html" %} + +{% block breadcrumbs %} +{{ block.super }} +/ {{ job.id }} +/ log +{% endblock %} + +{% block title %} +Job {{ job.id }} log +{% endblock %} + +{% block content %} + +

Job {{ job.id }} log

+
+{{ log }}
+
+ +{% endblock %} -- 2.30.2