projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 5539-better-docker
[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 101b4a5e807d6715a1264aa8bad89e61b9a86c12..0e12f9cfd4127c61eed5e4b764418b1cabed3ab6 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/log_viewer.js
+++ b/
apps/workbench/app/assets/javascripts/log_viewer.js
@@
-15,7
+15,7
@@
function addToLogViewer(logViewer, lines, taskState) {
var v = lines[a].match(re);
if (v != null) {
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') {
v11 = v[11];
if (typeof v[11] === 'undefined') {
@@
-89,12
+89,12
@@
function addToLogViewer(logViewer, lines, taskState) {
taskid: v11,
node: node,
slot: slot,
taskid: v11,
node: node,
slot: slot,
- message: message,
+ message: message
.replace(/&/g, '&').replace(/</g, '<').replace(/>/g, '>')
,
type: type
});
count += 1;
} else {
type: type
});
count += 1;
} else {
- console.log("Did not parse: " + lines[a]);
+ console.log("Did not parse
line " + a + "
: " + lines[a]);
}
}
logViewer.add(items);
}
}
logViewer.add(items);