4233: try to match older log date format
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 20 Nov 2014 13:21:08 +0000 (14:21 +0100)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 20 Nov 2014 13:21:08 +0000 (14:21 +0100)
apps/workbench/app/assets/javascripts/event_log.js

index 542bb56d68211a8ec30171d88afd87ca1c42845a..8c248aca20e433cc1211402de8e3a8ba45bf7c2d 100644 (file)
@@ -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');