lib/fluent/plugin/in_tail.rb in fluentd-0.12.0.pre.2 vs lib/fluent/plugin/in_tail.rb in fluentd-0.12.0.pre.3

@@ -56,11 +56,11 @@
                            method(:parse_singleline)
                          end
     end
 
     def configure_parser(conf)
-      @parser = TextParser.new
+      @parser = Plugin.new_parser(conf['format'])
       @parser.configure(conf)
     end
 
     def configure_tag
       if @tag.index('*')
@@ -190,11 +190,11 @@
     end
 
     def flush_buffer(tw)
       if lb = tw.line_buffer
         lb.chomp!
-        @parser.parse(lb) { |time, record|
+        @parser.call(lb) { |time, record|
           if time && record
             tag = if @tag_prefix || @tag_suffix
                     @tag_prefix + tw.tag + @tag_suffix
                   else
                     @tag
@@ -231,11 +231,11 @@
     end
 
     def convert_line_to_event(line, es)
       begin
         line.chomp!  # remove \n
-        @parser.parse(line) { |time, record|
+        @parser.call(line) { |time, record|
           if time && record
             es.add(time, record)
           else
             log.warn "pattern not match: #{line.inspect}"
           end
@@ -255,13 +255,13 @@
     end
 
     def parse_multilines(lines, tail_watcher)
       lb = tail_watcher.line_buffer
       es = MultiEventStream.new
-      if @parser.parser.has_firstline?
+      if @parser.has_firstline?
         lines.each { |line|
-          if @parser.parser.firstline?(line)
+          if @parser.firstline?(line)
             if lb
               convert_line_to_event(lb, es)
             end
             lb = line
           else
@@ -274,10 +274,10 @@
         }
       else
         lb ||= ''
         lines.each do |line|
           lb << line
-          @parser.parse(lb) { |time, record|
+          @parser.call(lb) { |time, record|
             if time && record
               convert_line_to_event(lb, es)
               lb = ''
             end
           }