Przeglądaj źródła

HUE-6983 [jb] View Logs of a killed workflow gives 500 error

jdesjean 7 lat temu
rodzic
commit
d823dc2002

+ 3 - 2
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2854,8 +2854,9 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
               format: 'link'
             },
             function(data) {
-              if (data.attemptid) {
-                openJob(data.attemptid);
+              var id = data.attemptid || data.job;
+              if (id) {
+                openJob(id);
               } else {
                 $(document).trigger("error", '${ _("No log available") }');
               }

+ 6 - 3
apps/jobbrowser/src/jobbrowser/views.py

@@ -415,9 +415,12 @@ def job_single_logs(request, job, offset=LOG_OFFSET_BYTES):
       task = recent_tasks[0]
 
   if task is None or not task.taskAttemptIds:
-    raise PopupException(_("No tasks found for job %(id)s.") % {'id': job.jobId})
-
-  params = {'job': job.jobId, 'taskid': task.taskId, 'attemptid': task.taskAttemptIds[-1], 'offset': offset}
+    if request.GET.get('format') == 'link':
+      params = {'job': job.jobId, 'offset': offset}
+    else:
+      raise PopupException(_("No tasks found for job %(id)s.") % {'id': job.jobId})
+  else:
+    params = {'job': job.jobId, 'taskid': task.taskId, 'attemptid': task.taskAttemptIds[-1], 'offset': offset}
 
   if request.GET.get('format') == 'link':
     return JsonResponse(params)