Use output.log for completed card and added sanitisation filter

Author: jscgh

completed.html.erb

@@ -72,6 +72,42 @@ def sanitize_live_log(text)
   compact.join("\n").strip
 end
 
+def sanitize_output_log(text)
+  return nil if text.nil?
+
+  lines = text.split("\n")
+  cleaned = []
+  index = 0
+
+  while index < lines.length
+    line = lines[index]
+
+    if line.start_with?("WARN: [PBSPRO] queue status cannot be fetched")
+      index += 1
+      index += 1 while index < lines.length && !lines[index].strip.empty?
+      index += 1 if index < lines.length && lines[index].strip.empty?
+      next
+    end
+
+    if line.strip == "Cleaning up..."
+      break
+    end
+
+    if line.match?(/^=+$/) && index + 1 < lines.length && lines[index + 1].include?("Resource Usage on ")
+      break
+    end
+
+    cleaned << line
+    index += 1
+  end
+
+  while cleaned.any? && cleaned.last.strip.empty?
+    cleaned.pop
+  end
+
+  cleaned.join("\n").strip
+end
+
 base_out_dir = (connect.respond_to?(:base_out_dir) && !connect.base_out_dir.blank?) ? connect.base_out_dir : portal_default_base_out_dir
 results_url_base = (connect.respond_to?(:results_url_base) && !connect.results_url_base.blank?) ? connect.results_url_base : portal_default_results_url_base
 session_output_dir = (connect.respond_to?(:session_output_dir) && !connect.session_output_dir.blank?) ? connect.session_output_dir : nil
@@ -82,7 +118,11 @@ output_log_path = File.join(log_dir, "output.log")
 output_log_url = file_url(results_url_base, output_log_path)
 summary_log_url = File.file?(output_log_path) ? output_log_url : live_log_url
 summary_log_label = File.file?(output_log_path) ? "output.log" : "live_log.log"
-log_text = sanitize_live_log(tail_text(live_log_path))
+log_text = if File.file?(output_log_path)
+  sanitize_output_log(tail_text(output_log_path, 16384, 40))
+else
+  sanitize_live_log(tail_text(live_log_path))
+end
 %>
 <div class="ood-completed-log-card">
 <div><b>Log</b>: <a target="_blank" rel="noopener" href="<%= summary_log_url %>"><%= summary_log_label %></a></div>