embulk-parser-apache-custom-log 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbe680a9b2b757a3246793742c76daddc69ef2b
-  data.tar.gz: 7a34d2b09a0a8415dae2c6e27817e9e61e350a74
+  metadata.gz: 3ba30504cc0a6d376ddd430be6eb5e52d1268ec2
+  data.tar.gz: cf21f1c47b0f0fa4b15ed2f2f1bda56a7224e8f6
 SHA512:
-  metadata.gz: d7c6eefd116f4c29d375a1acf888114bdd62a6a6b971b36ffd812d3cca7813e1d16d31cea20564b76e6ca5c494b6b2013605fbf9a69c32a50afea4361384f9b2
-  data.tar.gz: 50821f2d02c0ff7f238b161770a49714dcf5ca9b67d3faf21c6f62163a166405552620d91e6e3a7a9c8b0e0fee0291c5a0bef2fe378278ede529d57949d85559
+  metadata.gz: a441b181d0243e8f00a97ccc2fbc4e7fe53a3918a4dac8574e6c04d85d6ae494390effa1d1b384a308f464cdb1cd32cbf04550d08f38cfd46ff0effc2669f75a
+  data.tar.gz: 6d3dd325b7168007af1bf5be476534d899f6ff061f0ea2ad918b220ea6612e97281680d91d534003fa3a95cc9198503d141231f41c16645b5f080a798e88cc72

data/build.gradle

@@ -12,7 +12,7 @@ configurations {
     provided
 }
 
-version = "0.2.0"
+version = "0.3.0"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.7.4"

data/src/main/java/org/embulk/parser/apache/log/TimestampLogElementFactory.java

@@ -1,5 +1,8 @@
 package org.embulk.parser.apache.log;
 
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
 import org.apache.commons.lang3.StringUtils;
 import org.embulk.spi.time.TimestampParser;
 
@@ -18,7 +21,30 @@ public class TimestampLogElementFactory implements LogElementFactory<TimestampLo
         if(StringUtils.isEmpty(parameter)){
             return new TimestampLogElement(task, name, "\\[([^\\]]+)\\]");
         }else{
-            return new TimestampLogElement(task, name, parameter);
+            String regex = toTimestampRegex(parameter);
+            return new TimestampLogElement(task, name, regex, parameter);
         }
     }
+
+    private String toTimestampRegex(String parameter) {
+        String regex = "(" + parameter + ")";
+        regex = regex.replaceAll("\\[|\\]","\\\\$0");
+
+        regex = regex.replaceAll("%[abhpABPZ]","[A-z]+");
+        regex = regex.replaceAll("%c","[A-z]{3} [A-z]{3} \\\\d{2} \\\\d{2}:\\\\d{2}:\\\\d{2} \\\\d{4}");
+        regex = regex.replaceAll("%[dgmyCHIMSUVW]","\\\\d{2}");
+        regex = regex.replaceAll("%[Dx]","\\\\d{2}/\\\\d{2}/\\\\d{2}");
+        regex = regex.replaceAll("%[ekl]","[1-9 ]\\\\d");
+        regex = regex.replaceAll("%F","\\\\d{4}-\\\\d{2}-\\\\d{2}");
+        regex = regex.replaceAll("%[GY]","\\\\d{4}");
+        regex = regex.replaceAll("%j","\\\\d{3}");
+        regex = regex.replaceAll("%r","\\\\d{2}:\\\\d{2}:\\\\d{2} [A-z]+");
+        regex = regex.replaceAll("%R","\\\\d{2}:\\\\d{2}");
+        regex = regex.replaceAll("%s","\\\\d+");
+        regex = regex.replaceAll("%[TX]","\\\\d{2}:\\\\d{2}:\\\\d{2}");
+        regex = regex.replaceAll("%[uw]","\\\\d");
+        regex = regex.replaceAll("%z","\\\\+\\\\d{4}");
+
+        return regex;
+    }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-apache-custom-log
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hiroyuki Sato
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ files:
 - src/test/resources/yml/test_combined.yml
 - src/test/resources/yml/test_combined2.yml
 - src/test/resources/yml/test_common.yml
-- classpath/embulk-parser-apache-custom-log-0.2.0.jar
+- classpath/embulk-parser-apache-custom-log-0.3.0.jar
 homepage: https://github.com/jami-i/embulk-parser-apache-custom-log
 licenses:
 - MIT