Fix off-by-one-month in timestamp conversion. refs #2883

[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 ac843271ffd0c9e49f3fd43e7ac9c77f300d37f7..74bba133fbc87fd99f34eaff0c2b4155cfa9e90e 100644 (file)
--- a/apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/apps/workbench/app/assets/javascripts/log_viewer.js
@@ -8,11 +8,14 @@ function newTaskState() {
 
 function addToLogViewer(logViewer, lines, taskState) {
     var re = /((\d\d\d\d)-(\d\d)-(\d\d))_((\d\d):(\d\d):(\d\d)) ([a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}) (\d+) (\d+)? (.*)/;
+
+    var items = [];
+    var count = logViewer.items.length;
     for (var a in lines) {
         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') {
@@ -39,7 +42,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;
@@ -47,7 +50,6 @@ function addToLogViewer(logViewer, lines, taskState) {
                         taskState[v11].outcome = "success";
                         taskState[v11].runtime = Number(m[1]);
                         taskState.complete_count += 1;
-                        console.log(taskState[v11].runtime);
                     }
                     else if (m = /^failure \(\#\d+, (temporary|permanent)\) after (\d+) second/.exec(message)) {
                         taskState[v11].outcome = "failure";
@@ -56,7 +58,6 @@ function addToLogViewer(logViewer, lines, taskState) {
                         if (m[1] == "permanent") {
                             taskState.incomplete_count += 1;
                         }
-                        console.log(taskState[v11].runtime);
                     }
                     else if (m = /^child \d+ started on ([^.]*)\.(\d+)/.exec(message)) {
                         taskState[v11].node = m[1];
@@ -64,13 +65,11 @@ function addToLogViewer(logViewer, lines, taskState) {
                         if (taskState.nodes.indexOf(m[1], 0) == -1) {
                             taskState.nodes.push(m[1]);
                         }
-                        for (var i in logViewer.items) {
+                        for (var i in items) {
                             if (i > 0) {
-                                var val = logViewer.items[i].values();
-                                if (val.taskid === v11) {
-                                    val.node = m[1];
-                                    val.slot = m[2];
-                                    logViewer.items[i].values(val);
+                                if (items[i].taskid === v11) {
+                                    items[i].node = m[1];
+                                    items[i].slot = m[2];
                                 }
                             }
                         }
@@ -80,16 +79,11 @@ function addToLogViewer(logViewer, lines, taskState) {
                 node = taskState[v11].node;
                 slot = taskState[v11].slot;
             } else {
-                if (/^status: /.test(message)) {
-                    type = "job-status";
-                    message = message.substr(8);
-                } else {
-                    type = "crunch";
-                }
+                type = "crunch";
             }
 
-            logViewer.add({
-                id: logViewer.items.length,
+            items.push({
+                id: count,
                 ts: ts,
                 timestamp: ts.toLocaleDateString() + " " + ts.toLocaleTimeString(),
                 taskid: v11,
@@ -98,12 +92,12 @@ function addToLogViewer(logViewer, lines, taskState) {
                 message: message,
                 type: type
             });
-
+            count += 1;
         } else {
             console.log("Did not parse: " + lines[a]);
         }
     }
-    logViewer.update();
+    logViewer.add(items);
 }
 
 function sortById(a, b, opt) {
@@ -189,13 +183,9 @@ function dumbPluralize(n, s, p) {
 function generateJobOverview(id, logViewer, taskState) {
     var html = "";
 
-    var first = logViewer.items[1];
-    var last = logViewer.items[logViewer.items.length-1];
-
-    {
-        html += "<div>";
-        html += "Started at " + first.values().timestamp;
-
+    if (logViewer.items.length > 2) {
+        var first = logViewer.items[1];
+        var last = logViewer.items[logViewer.items.length-1];
         var duration = (last.values().ts.getTime() - first.values().ts.getTime()) / 1000;
 
         var hours = 0;
@@ -214,7 +204,9 @@ function generateJobOverview(id, logViewer, taskState) {
 
         var tcount = taskState.task_count;
 
-        html += ".  " + dumbPluralize(tcount, " task") + " run over ";
+        html += "<p>";
+        html += "Started at " + first.values().timestamp + ".  ";
+        html += "Ran " + dumbPluralize(tcount, " task") + " over ";
         if (hours > 0) {
             html += dumbPluralize(hours, " hour");
         }
@@ -227,13 +219,64 @@ function generateJobOverview(id, logViewer, taskState) {
 
         html += " using " + dumbPluralize(taskState.nodes.length, " node");
 
-        html += ".  " + dumbPluralize(taskState.complete_count, "task") + " complete";
+        html += ".  " + dumbPluralize(taskState.complete_count, "task") + " completed";
         html += ",  " + dumbPluralize(taskState.incomplete_count, "task") +  " incomplete";
         html += " (" + dumbPluralize(taskState.failure_count, " failure") + ")";
 
-        html += ".  Finished at " + last.values().timestamp;
-        html += "</div>";
+        html += ".  Finished at " + last.values().timestamp + ".";
+        html += "</p>";
+    } else {
+       html = "<p>Job log is empty or failed to load.</p>";
     }
 
     $(id).html(html);
-}
\ No newline at end of file
+}
+
+function gotoPage(n, logViewer, page, id) {
+    if (n < 0) { return; }
+    if (n*page > logViewer.matchingItems.length) { return; }
+    logViewer.page_offset = n;
+    logViewer.show(n*page, page);
+}
+
+function updatePaging(id, logViewer, page) {
+    var p = "";
+    var i = logViewer.matchingItems.length;
+    var n;
+    for (n = 0; (n*page) < i; n += 1) {
+        if (n == logViewer.page_offset) {
+            p += "<span class='log-viewer-page-num'>" + (n+1) + "</span> ";
+        } else {
+            p += "<a href=\"#\" class='log-viewer-page-num log-viewer-page-" + n + "'>" + (n+1) + "</a> ";
+        }
+    }
+    $(id).html(p);
+    for (n = 0; (n*page) < i; n += 1) {
+        (function(n) {
+            $(".log-viewer-page-" + n).on("click", function() {
+                gotoPage(n, logViewer, page, id);
+                return false;
+            });
+        })(n);
+    }
+
+    if (logViewer.page_offset == 0) {
+        $(".log-viewer-page-up").addClass("text-muted");
+    } else {
+        $(".log-viewer-page-up").removeClass("text-muted");
+    }
+
+    if (logViewer.page_offset == (n-1)) {
+        $(".log-viewer-page-down").addClass("text-muted");
+    } else {
+        $(".log-viewer-page-down").removeClass("text-muted");
+    }
+}
+
+function nextPage(logViewer, page, id) {
+    gotoPage(logViewer.page_offset+1, logViewer, page, id);
+}
+
+function prevPage(logViewer, page, id) {
+    gotoPage(logViewer.page_offset-1, logViewer, page, id);
+}