fluent-plugin-multi-format-parser 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cddae10dd64bc3831e60a367068d0ed2e83d23db
-  data.tar.gz: 79c4d6a4c3bee3d9b08b0c65ca898debb3856183
+  metadata.gz: e03e39eca4a755d270f2f4e5d6f7122b9a53143d
+  data.tar.gz: 56e44dbaf28967bd180a9e391fce9cb52745f29c
 SHA512:
-  metadata.gz: f282279056e844ac486981990f32b2f048aaf44516bdcaa996693c62229572983a06f4747414ce08c9a7b86770b2079bd705365bfaefa544890cdffb77a0fd56
-  data.tar.gz: ca96a092b89220ad3de24f204c97f7a3d2d715057ee32c5946b48dbf5bc5ad1e991e573ea9db10e7c9917674aa08597c4aebe7b51b458959bea44faad8515362
+  metadata.gz: e6aa259c436b56234a1071e080a022ae7704a766f04fe079168e9084409c2c5a4e6b3f67dea1c72c93e0517606f246ff1b739dec63d423218860ac6224812e04
+  data.tar.gz: fbcb92363e90e4af642e80572809eb4c2703abeda0c4465b2f6b8854cc3263aa900944ac84f37605e86f3d5390f5962569f8f45b52f737fdc48a05eb1acd58c8

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/fluent/plugin/parser_multi_format.rb

@@ -2,52 +2,96 @@ require 'fluent/parser'
 
 module Fluent
   class TextParser
-    class MultiFormatParser
-      include Configurable
+    if defined?(::Fluent::Parser)
+      class MultiFormatParser < Parser
+        Plugin.register_parser('multi_format', self)
 
-      def initialize
-        super
+        def initialize
+          super
 
-        @parsers = []
-      end
+          @parsers = []
+        end
 
-      def configure(conf)
-        super
+        def configure(conf)
+          super
 
-        conf.elements.each { |e|
-          next unless ['pattern', 'format'].include?(e.name)
+          conf.elements.each { |e|
+            next unless ['pattern', 'format'].include?(e.name)
 
-          parser = TextParser.new
-          parser.configure(e)
-          @parsers << parser.parser
-        }
-      end
+            parser = Plugin.new_parser(e['format'])
+            parser.configure(e)
+            @parsers << parser
+          }
+        end
 
-      def call(text)
-        @parsers.each { |parser|
-          begin
-            parser.call(text) { |time, record|
-              if time && record
-                if block_given?
+        def parse(text)
+          @parsers.each { |parser|
+            begin
+              parser.parse(text) { |time, record|
+                if time && record
                   yield time, record
                   return
-                else
-                  return time, record
                 end
-              end
-            }
-          rescue # ignore parser error
-          end
-        }
+              }
+            rescue # ignore parser error
+            end
+          }
 
-        if block_given?
           yield nil, nil
-        else
-          return nil, nil
         end
       end
-    end
+    else # support old API. Will be removed.
+      class MultiFormatParser
+        include Configurable
+
+        def initialize
+          super
+
+          @parsers = []
+        end
+
+        def configure(conf)
+          super
+
+          conf.elements.each { |e|
+            next unless ['pattern', 'format'].include?(e.name)
 
-    register_template('multi_format', Proc.new { MultiFormatParser.new })
+            parser = TextParser.new
+            parser.configure(e)
+            @parsers << parser.parser
+          }
+        end
+
+        def parse(text)
+          @parsers.each { |parser|
+            begin
+              parser.call(text) { |time, record|
+                if time && record
+                  if block_given?
+                    yield time, record
+                    return
+                  else
+                    return time, record
+                  end
+                end
+              }
+            rescue # ignore parser error
+            end
+          }
+
+          if block_given?
+            yield nil, nil
+          else
+            return nil, nil
+          end
+        end
+
+        def call(*a, &b)
+          parse(*a, &b)
+        end
+      end
+
+      register_template('multi_format', Proc.new { MultiFormatParser.new })
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-multi-format-parser
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd