Merge branch '19954-permission-dedup-doc'

[arvados.git] / apps / workbench / app / assets / javascripts / log_viewer.js

diff --git a/apps/workbench/app/assets/javascripts/log_viewer.js b/apps/workbench/app/assets/javascripts/log_viewer.js
index 493975fe4fe92e684bde9e712376576e6b2d0f41..b201ed7f105229488763c64d49c2761eb17312a0 100644 (file)
--- a/apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 function newTaskState() {
     return {"complete_count": 0,
             "failure_count": 0,
@@ -15,7 +19,7 @@ function addToLogViewer(logViewer, lines, taskState) {
         var v = lines[a].match(re);
         if (v != null) {
 
-            var ts = new Date(Date.UTC(v[2], v[3], v[4], v[6], v[7], v[8]));
+            var ts = new Date(Date.UTC(v[2], v[3]-1, v[4], v[6], v[7], v[8]));
 
             v11 = v[11];
             if (typeof v[11] === 'undefined') {
@@ -42,7 +46,7 @@ function addToLogViewer(logViewer, lines, taskState) {
                     } else if (/^srun: /.test(message) || /^slurmd/.test(message)) {
                         type = "task-dispatch";
                     } else {
-                        type = "task-output";
+                        type = "task-print";
                     }
                 } else {
                     var m;
@@ -89,12 +93,12 @@ function addToLogViewer(logViewer, lines, taskState) {
                 taskid: v11,
                 node: node,
                 slot: slot,
-                message: message,
+                message: message.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;'),
                 type: type
             });
             count += 1;
         } else {
-            console.log("Did not parse: " + lines[a]);
+            console.log("Did not parse line " + a + ": " + lines[a]);
         }
     }
     logViewer.add(items);