From: Phil Hodgson <bitbucket@philhodgson.net>
Date: Thu, 20 Nov 2014 13:21:08 +0000 (+0100)
Subject: 4233: try to match older log date format
X-Git-Tag: 1.1.0~1966^2~21
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/84ff06d37f920ef6cf400189ea19edcf6158993c

4233: try to match older log date format
---

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index 542bb56d68..8c248aca20 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -66,6 +66,12 @@ $(document).on('ajax:complete ready', function() {
 function processLogLineForChart( logLine ) {
     try {
         var match = logLine.match(/(\S+) (\S+) (\S+) (\S+) stderr crunchstat: (\S+) (.*) -- interval (.*)/);
+        if( !match ) {
+            match = logLine.match(/((?:Sun|Mon|Tue|Wed|Thu|Fri|Sat) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{1,2} \d\d:\d\d:\d\d \d{4}) (\S+) (\S+) (\S+) stderr crunchstat: (\S+) (.*) -- interval (.*)/);
+            if( match ) {
+                match[1] = (new Date(match[1] + ' UTC')).toISOString().replace('Z','');
+            }
+        }
         if( match ) {
             // the timestamp comes first
             var timestamp = match[1].replace('_','T');