From 1c7cee2d2c92e0c43da47ea0566b6b6979b054a5 Mon Sep 17 00:00:00 2001
From: Maxime Chassagneux <4163013@airfrance.fr>
Date: Wed, 1 Feb 2017 17:32:15 +0100
Subject: [PATCH] Upgrade to Grok 0.1.5

---
 pom.xml                                       |  6 +-
 .../airfrance/diqmqs/logparser/Parser.java    | 81 ++++++++++---------
 2 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ae0575..f0032de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
   
   <description>logParser - send data to influxdb</description>
    <properties>
-          <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
+          <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
    </properties>
   	<dependencies>
 		<dependency>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>io.thekraken</groupId>
 			<artifactId>grok</artifactId>
-			<version>0.1.3</version>
+			<version>0.1.5</version>
 		</dependency>
         <dependency>
 			<groupId>commons-io</groupId>
diff --git a/src/main/java/com/airfrance/diqmqs/logparser/Parser.java b/src/main/java/com/airfrance/diqmqs/logparser/Parser.java
index 1420d52..ff5a733 100644
--- a/src/main/java/com/airfrance/diqmqs/logparser/Parser.java
+++ b/src/main/java/com/airfrance/diqmqs/logparser/Parser.java
@@ -9,9 +9,9 @@ import org.apache.commons.io.input.Tailer;
 import org.apache.commons.io.input.TailerListenerAdapter;
 import org.apache.commons.lang3.StringUtils;
 
-import oi.thekraken.grok.api.Grok;
-import oi.thekraken.grok.api.Match;
-import oi.thekraken.grok.api.exception.GrokException;
+import io.thekraken.grok.api.Grok;
+import io.thekraken.grok.api.Match;
+import io.thekraken.grok.api.exception.GrokException;
 
 public class Parser extends TailerListenerAdapter {
 	
@@ -95,42 +95,8 @@ public class Parser extends TailerListenerAdapter {
 					}
 				}
 
-				try {
-					if ( tagName.equalsIgnoreCase("year") ) {
-						hasDate = true;
-						cal.set(Calendar.YEAR,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("month") ) {
-						hasDate = true;
-						cal.set(Calendar.MONTH,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("day") ) {
-						hasDate = true;
-						cal.set(Calendar.DAY_OF_MONTH,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("hour") ) {
-						hasDate = true;
-						cal.set(Calendar.HOUR_OF_DAY,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("minute") ) {
-						hasDate = true;
-						cal.set(Calendar.MINUTE,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("second") ) {
-						hasDate = true;
-						cal.set(Calendar.SECOND,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-					if ( tagName.equalsIgnoreCase("msecond") ) {
-						hasDate = true;
-						cal.set(Calendar.MILLISECOND,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
-					}
-				}catch(Exception e)
-				{
-					log.error("Impossible de parser la date " + e.getMessage());
-				}
-				
-				
-				
+				hasDate = makeTimeStampFromDate(hasDate, cal, entry);
+
 			}
 			sb.append(" ");
 			//Field
@@ -156,6 +122,43 @@ public class Parser extends TailerListenerAdapter {
 		}   
      }
 
+	private boolean makeTimeStampFromDate(boolean hasDate, Calendar cal, Map.Entry<String, Object> entry) {
+		try {
+			if ( tagName.equalsIgnoreCase("year") ) {
+				hasDate = true;
+				cal.set(Calendar.YEAR,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("month") ) {
+				hasDate = true;
+				cal.set(Calendar.MONTH,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("day") ) {
+				hasDate = true;
+				cal.set(Calendar.DAY_OF_MONTH,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("hour") ) {
+				hasDate = true;
+				cal.set(Calendar.HOUR_OF_DAY,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("minute") ) {
+				hasDate = true;
+				cal.set(Calendar.MINUTE,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("second") ) {
+				hasDate = true;
+				cal.set(Calendar.SECOND,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+			if ( tagName.equalsIgnoreCase("msecond") ) {
+				hasDate = true;
+				cal.set(Calendar.MILLISECOND,  Integer.parseInt(String.valueOf(entry.getValue()) ) );
+			}
+		}catch(Exception e)
+		{
+			log.error("Impossible de parser la date " + e.getMessage());
+		}
+		return hasDate;
+	}
+
 	 String sanitizeString(String s)
 	 {
 		 return s.trim().replaceAll(" ", "\\\\ ").replaceAll(",", "\\\\,").replaceAll("=", "\\\\=");