fluentd 0.10.62 → 0.12.0.pre.1

data/lib/fluent/input.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 module Fluent
   class Input
     include Configurable
@@ -30,7 +29,10 @@ module Fluent
     def configure(conf)
       super
 
-      @router = Engine
+      if label_name = conf['@label']
+        label = Engine.root_agent.find_label(label_name)
+        @router = label.event_router
+      end
     end
 
     def start

data/lib/fluent/label.rb

@@ -0,0 +1,18 @@
+module Fluent
+  require 'fluent/agent'
+
+  class Label < Agent
+    def initialize(name, opts = {})
+      super(opts)
+
+      @context = name
+      @root_agent = nil
+    end
+
+    attr_accessor :root_agent
+
+    def handle_emits_error(tag, es, e)
+      @root_agent.handle_emits_error(tag, es, e)
+    end
+  end
+end

data/lib/fluent/load.rb

@@ -14,9 +14,6 @@ begin
 rescue
   # ignore setup error on Win or similar platform which doesn't support signal
 end
-# I hate global variable but we suffer pain now for the sake of future.
-# We will switch to MessagePack 0.5 and deprecate 0.4.
-$use_msgpack_5 = defined?(MessagePack::Packer) ? true : false
 require 'cool.io'
 require 'fluent/env'
 require 'fluent/version'
@@ -33,4 +30,5 @@ require 'fluent/event'
 require 'fluent/buffer'
 require 'fluent/input'
 require 'fluent/output'
+require 'fluent/filter'
 require 'fluent/match'

data/lib/fluent/log.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/fluent/match.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 module Fluent
   class Match
     def initialize(pattern_str, output)
@@ -52,26 +51,21 @@ module Fluent
     end
   end
 
-
   class MatchPattern
     def self.create(str)
-      GlobMatchPattern.new(str)
+      if str == '**'
+        AllMatchPattern.new
+      else
+        GlobMatchPattern.new(str)
+      end
     end
-
-    #def match(str)
-    #end
   end
 
-  ## TODO
-  #class RegexMatchPattern < MatchPattern
-  #  def initialize(regex)
-  #    @regex = regex
-  #  end
-  #
-  #  def match(str)
-  #    @regex.match(str) != nil
-  #  end
-  #end
+  class AllMatchPattern < MatchPattern
+    def match(str)
+      true
+    end
+  end
 
   class GlobMatchPattern < MatchPattern
     def initialize(pat)
@@ -171,7 +165,6 @@ module Fluent
     end
   end
 
-
   class OrMatchPattern < MatchPattern
     def initialize(patterns)
       @patterns = patterns

data/lib/fluent/mixin.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,23 +13,15 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 module Fluent
   class TimeFormatter
-    require 'fluent/timezone'
-
-    def initialize(format, localtime, timezone = nil)
+    def initialize(format, localtime)
       @tc1 = 0
       @tc1_str = nil
       @tc2 = 0
       @tc2_str = nil
 
-      if formatter = Fluent::Timezone.formatter(timezone, format)
-        define_singleton_method(:format_nocache) {|time|
-          formatter.call(time)
-        }
-        return
-      end
-
       if format
         if localtime
           define_singleton_method(:format_nocache) {|time|
@@ -122,16 +112,15 @@ module Fluent
   end
 
   module SetTimeKeyMixin
-    require 'fluent/timezone'
     include RecordFilterMixin
 
-    attr_accessor :include_time_key, :time_key, :localtime, :timezone
+    attr_accessor :include_time_key, :time_key, :localtime
 
     def configure(conf)
-      @include_time_key = false
-
       super
 
+      @include_time_key = false
+
       if s = conf['include_time_key']
         include_time_key = Config.bool_value(s)
         raise ConfigError, "Invalid boolean expression '#{s}' for include_time_key parameter" if include_time_key.nil?
@@ -149,12 +138,7 @@ module Fluent
           @localtime = false
         end
 
-        if conf['timezone']
-          @timezone = conf['timezone']
-          Fluent::Timezone.validate!(@timezone)
-        end
-
-        @timef = TimeFormatter.new(@time_format, @localtime, @timezone)
+        @timef = TimeFormatter.new(@time_format, @localtime)
       end
     end
 
@@ -171,10 +155,10 @@ module Fluent
     attr_accessor :include_tag_key, :tag_key
 
     def configure(conf)
-      @include_tag_key = false
-
       super
 
+      @include_tag_key = false
+
       if s = conf['include_tag_key']
         include_tag_key = Config.bool_value(s)
         raise ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter" if include_tag_key.nil?

data/lib/fluent/output.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,6 +13,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 module Fluent
   class OutputChain
     def initialize(array, tag, es, chain=NullOutputChain.instance)
@@ -70,7 +69,10 @@ module Fluent
     def configure(conf)
       super
 
-      @router = Engine
+      if label_name = conf['@label']
+        label = Engine.root_agent.find_label(label_name)
+        @router = label.event_router
+      end
     end
 
     def start
@@ -94,7 +96,7 @@ module Fluent
     def initialize(output)
       @output = output
       @finish = false
-      @next_time = Time.now.to_f + 1.0
+      @next_time = Engine.now + 1.0
     end
 
     def configure(conf)
@@ -128,7 +130,7 @@ module Fluent
       @mutex.lock
       begin
         until @finish
-          time = Time.now.to_f
+          time = Engine.now
 
           if @next_time <= time
             @mutex.unlock
@@ -137,7 +139,7 @@ module Fluent
             ensure
               @mutex.lock
             end
-            next_wait = @next_time - Time.now.to_f
+            next_wait = @next_time - Engine.now
           else
             next_wait = @next_time - time
           end
@@ -188,7 +190,6 @@ module Fluent
     def configure(conf)
       super
 
-      @retry_wait = @retry_wait.to_f # converted to Float for calc_retry_wait
       @buffer = Plugin.new_buffer(@buffer_type)
       @buffer.configure(conf)
 
@@ -207,7 +208,7 @@ module Fluent
       }
 
       if sconf = conf.elements.select {|e| e.name == 'secondary' }.first
-        type = sconf['@type'] || conf['@type'] || sconf['type'] || conf['type']
+        type = sconf['type'] || conf['type']
         @secondary = Plugin.new_output(type)
         @secondary.configure(sconf)
 
@@ -226,7 +227,7 @@ module Fluent
     end
 
     def start
-      @next_flush_time = Time.now.to_f + @flush_interval
+      @next_flush_time = Engine.now + @flush_interval
       @buffer.start
       @secondary.start if @secondary
       @writers.each {|writer| writer.start }
@@ -268,17 +269,17 @@ module Fluent
     #def write(chunk)
     #end
 
-    def enqueue_buffer(force = false)
+    def enqueue_buffer
       @buffer.keys.each {|key|
         @buffer.push(key)
       }
     end
 
     def try_flush
-      time = Time.now.to_f
+      time = Engine.now
 
       empty = @buffer.queue_size == 0
-      if empty && @next_flush_time < (now = Time.now.to_f)
+      if empty && @next_flush_time < (now = Engine.now)
         @buffer.synchronize do
           if @next_flush_time < now
             enqueue_buffer
@@ -321,11 +322,11 @@ module Fluent
           @num_errors = 0
           # Note: don't notify to other threads to prevent
           #       burst to recovered server
-          $log.warn "retry succeeded.", :plugin_id=>plugin_id
+          $log.warn "retry succeeded.", :instance=>object_id
         end
 
         if has_next
-          return Time.now.to_f + @queued_chunk_flush_interval
+          return Engine.now + @queued_chunk_flush_interval
         else
           return time + @try_flush_interval
         end
@@ -346,20 +347,20 @@ module Fluent
         end
 
         if @disable_retry_limit || error_count < @retry_limit
-          $log.warn "temporarily failed to flush the buffer.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
+          $log.warn "temporarily failed to flush the buffer.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
           $log.warn_backtrace e.backtrace
 
         elsif @secondary
           if error_count == @retry_limit
-            $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
+            $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
             $log.warn "retry count exceededs limit. falling back to secondary output."
             $log.warn_backtrace e.backtrace
             retry  # retry immediately
           elsif error_count <= @retry_limit + @secondary_limit
-            $log.warn "failed to flush the buffer, next retry will be with secondary output.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
+            $log.warn "failed to flush the buffer, next retry will be with secondary output.", :next_retry=>Time.at(@next_retry_time), :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
             $log.warn_backtrace e.backtrace
           else
-            $log.warn "failed to flush the buffer.", :error_class=>e.class, :error=>e.to_s, :plugin_id=>plugin_id
+            $log.warn "failed to flush the buffer.", :error_class=>e.class, :error=>e.to_s, :instance=>object_id
             $log.warn "secondary retry count exceededs limit."
             $log.warn_backtrace e.backtrace
             write_abort
@@ -367,7 +368,7 @@ module Fluent
           end
 
         else
-          $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :plugin_id=>plugin_id
+          $log.warn "failed to flush the buffer.", :error_class=>e.class.to_s, :error=>e.to_s, :instance=>object_id
           $log.warn "retry count exceededs limit."
           $log.warn_backtrace e.backtrace
           write_abort
@@ -379,10 +380,7 @@ module Fluent
     end
 
     def force_flush
-      @num_errors_lock.synchronize do
-        @next_retry_time = Time.now.to_f - 1
-      end
-      enqueue_buffer(true)
+      enqueue_buffer
       submit_flush
     end
 
@@ -403,7 +401,7 @@ module Fluent
                # secondary retry
                @retry_wait * (2 ** (@num_errors - 2 - @retry_limit))
              end
-      retry_wait = wait.finite? ? wait + (rand * (wait / 4.0) - (wait / 8.0)) : wait
+      retry_wait = wait + (rand * (wait / 4.0) - (wait / 8.0))
       @max_retry_wait ? [retry_wait, @max_retry_wait].min : retry_wait
     end
 
@@ -461,8 +459,6 @@ module Fluent
 
 
   class TimeSlicedOutput < BufferedOutput
-    require 'fluent/timezone'
-
     def initialize
       super
       @localtime = true
@@ -471,31 +467,23 @@ module Fluent
 
     config_param :time_slice_format, :string, :default => '%Y%m%d'
     config_param :time_slice_wait, :time, :default => 10*60
-    config_param :timezone, :string, :default => nil
     config_set_default :buffer_type, 'file'  # overwrite default buffer_type
     config_set_default :buffer_chunk_limit, 256*1024*1024  # overwrite default buffer_chunk_limit
     config_set_default :flush_interval, nil
 
     attr_accessor :localtime
-    attr_reader :time_slicer # for test
 
     def configure(conf)
       super
 
+      # TODO timezone
       if conf['utc']
         @localtime = false
       elsif conf['localtime']
         @localtime = true
       end
 
-      if conf['timezone']
-        @timezone = conf['timezone']
-        Fluent::Timezone.validate!(@timezone)
-      end
-
-      if @timezone
-        @time_slicer = Timezone.formatter(@timezone, @time_slice_format)
-      elsif @localtime
+      if @localtime
         @time_slicer = Proc.new {|time|
           Time.at(time).strftime(@time_slice_format)
         }
@@ -550,14 +538,8 @@ module Fluent
       }
     end
 
-    def enqueue_buffer(force = false)
-      if force
-        @buffer.keys.each {|key|
-          @buffer.push(key)
-        }
-      else
-        @enqueue_buffer_proc.call
-      end
+    def enqueue_buffer
+      @enqueue_buffer_proc.call
     end
 
     #def format(tag, event)

data/lib/fluent/parser.rb

@@ -1,7 +1,5 @@
 #
-# Fluent
-#
-# Copyright (C) 2011 FURUHASHI Sadayuki
+# Fluentd
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,42 +13,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
 module Fluent
   require 'fluent/registry'
 
-  class ParserError < StandardError
-  end
-
-  class Parser
-    include Configurable
-
-    # SET false BEFORE CONFIGURE, to return nil when time not parsed
-    # 'configure()' may raise errors for unexpected configurations
-    attr_accessor :estimate_current_event
-
-    def initialize
-      super
-      @estimate_current_event = true
-    end
-
-    def configure(conf)
-      super
-    end
-
-    def parse(text)
-      raise NotImplementedError, "Implement this method in child class"
-    end
-
-    # Keep backward compatibility for existing plugins
-    def call(*a, &b)
-      parse(*a, &b)
-    end
-  end
-
   class TextParser
-    # Keep backward compatibility for existing plugins
-    ParserError = ::Fluent::ParserError
-
     class TimeParser
       def initialize(time_format)
         @cache1_key = nil
@@ -67,7 +34,7 @@ module Fluent
 
       def parse(value)
         unless value.is_a?(String)
-          raise ParserError, "value must be string: #{value}"
+          raise ArgumentError, "Value must be string: #{value}"
         end
 
         if @cache1_key == value
@@ -75,11 +42,7 @@ module Fluent
         elsif @cache2_key == value
           return @cache2_time
         else
-          begin
-            time = @parser.call(value).to_i
-          rescue => e
-            raise ParserError, "invalid time format: value = #{value}, error_class = #{e.class.name}, error = #{e.message}"
-          end
+          time = @parser.call(value).to_i
           @cache1_key = @cache2_key
           @cache1_time = @cache2_time
           @cache2_key = value
@@ -158,11 +121,16 @@ module Fluent
       end
     end
 
-    class RegexpParser < Parser
+    class RegexpParser
+      include Configurable
       include TypeConverter
 
       config_param :time_format, :string, :default => nil
 
+      # SET false BEFORE CONFIGURE, to return nil when time not parsed
+      # 'configure()' may raise errors for unexpected configurations
+      attr_accessor :estimate_current_event
+
       def initialize(regexp, conf={})
         super()
         @regexp = regexp
@@ -171,6 +139,7 @@ module Fluent
         end
 
         @time_parser = TimeParser.new(@time_format)
+        @estimate_current_event = true
         @mutex = Mutex.new
       end
 
@@ -183,7 +152,7 @@ module Fluent
         {'format' => @regexp, 'time_format' => @time_format}
       end
 
-      def parse(text)
+      def call(text)
         m = @regexp.match(text)
         unless m
           if block_given?
@@ -224,10 +193,21 @@ module Fluent
       end
     end
 
-    class JSONParser < Parser
+    class JSONParser
+      include Configurable
+
       config_param :time_key, :string, :default => 'time'
       config_param :time_format, :string, :default => nil
 
+      # SET false BEFORE CONFIGURE, to return nil when time not parsed
+      # 'configure()' may raise errors for unexpected configurations
+      attr_accessor :estimate_current_event
+
+      def initialize
+        super
+        @estimate_current_event = true
+      end
+
       def configure(conf)
         super
 
@@ -237,18 +217,14 @@ module Fluent
         end
       end
 
-      def parse(text)
+      def call(text)
         record = Yajl.load(text)
 
         if value = record.delete(@time_key)
           if @time_format
             time = @mutex.synchronize { @time_parser.parse(value) }
           else
-            begin
-              time = value.to_i
-            rescue => e
-              raise ParserError, "invalid time value: value = #{value}, error_class = #{e.class.name}, error = #{e.message}"
-            end
+            time = value.to_i
           end
         else
           if @estimate_current_event
@@ -272,13 +248,21 @@ module Fluent
       end
     end
 
-    class ValuesParser < Parser
+    class ValuesParser
+      include Configurable
       include TypeConverter
 
       config_param :keys, :string
       config_param :time_key, :string, :default => nil
       config_param :time_format, :string, :default => nil
 
+      attr_accessor :estimate_current_event
+
+      def initialize
+        super
+        @estimate_current_event = true
+      end
+
       def configure(conf)
         super
 
@@ -335,16 +319,11 @@ module Fluent
     class TSVParser < ValuesParser
       config_param :delimiter, :string, :default => "\t"
 
-      def configure(conf)
-        super
-        @key_num = @keys.length
-      end
-
-      def parse(text)
+      def call(text)
         if block_given?
-          yield values_map(text.split(@delimiter, @key_num))
+          yield values_map(text.split(@delimiter))
         else
-          return values_map(text.split(@delimiter, @key_num))
+          return values_map(text.split(@delimiter))
         end
       end
     end
@@ -359,7 +338,7 @@ module Fluent
         super(conf)
       end
 
-      def parse(text)
+      def call(text)
         @keys  = []
         values = []
 
@@ -383,7 +362,7 @@ module Fluent
         require 'csv'
       end
 
-      def parse(text)
+      def call(text)
         if block_given?
           yield values_map(CSV.parse_line(text))
         else
@@ -392,10 +371,19 @@ module Fluent
       end
     end
 
-    class NoneParser < Parser
+    class NoneParser
+      include Configurable
+
       config_param :message_key, :string, :default => 'message'
 
-      def parse(text)
+      attr_accessor :estimate_current_event
+
+      def initialize
+        super
+        @estimate_current_event = true
+      end
+
+      def call(text)
         record = {}
         record[@message_key] = text
         time = @estimate_current_event ? Engine.now : nil
@@ -407,12 +395,13 @@ module Fluent
       end
     end
 
-    class ApacheParser < Parser
-      REGEXP = /^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/
+    class ApacheParser
+      include Configurable
+
+      REGEXP = /^(?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/
       TIME_FORMAT = "%d/%b/%Y:%H:%M:%S %z"
 
       def initialize
-        super
         @time_parser = TimeParser.new(TIME_FORMAT)
         @mutex = Mutex.new
       end
@@ -421,7 +410,7 @@ module Fluent
         {'format' => REGEXP, 'time_format' => TIME_FORMAT}
       end
 
-      def parse(text)
+      def call(text)
         m = REGEXP.match(text)
         unless m
           if block_given?
@@ -475,7 +464,9 @@ module Fluent
       end
     end
 
-    class SyslogParser < Parser
+    class SyslogParser
+      include Configurable
+
       # From existence TextParser pattern
       REGEXP = /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
       # From in_syslog default pattern
@@ -484,8 +475,11 @@ module Fluent
       config_param :time_format, :string, :default => "%b %d %H:%M:%S"
       config_param :with_priority, :bool, :default => false
 
+      attr_accessor :estimate_current_event
+
       def initialize
         super
+        @estimate_current_event = true
         @mutex = Mutex.new
       end
 
@@ -500,7 +494,7 @@ module Fluent
         {'format' => @regexp, 'time_format' => @time_format}
       end
 
-      def parse(text)
+      def call(text)
         m = @regexp.match(text)
         unless m
           if block_given?
@@ -539,7 +533,9 @@ module Fluent
       end
     end
 
-    class MultilineParser < Parser
+    class MultilineParser
+      include Configurable
+
       config_param :format_firstline, :string, :default => nil
 
       FORMAT_MAX_NUM = 20
@@ -564,7 +560,7 @@ module Fluent
         end
       end
 
-      def parse(text, &block)
+      def call(text, &block)
         if block
           @parser.call(text, &block)
         else
@@ -632,7 +628,7 @@ module Fluent
       'tsv' => Proc.new { TSVParser.new },
       'ltsv' => Proc.new { LabeledTSVParser.new },
       'csv' => Proc.new { CSVParser.new },
-      'nginx' => Proc.new { RegexpParser.new(/^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/,  {'time_format'=>"%d/%b/%Y:%H:%M:%S %z"}) },
+      'nginx' => Proc.new { RegexpParser.new(/^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*) +\S*)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$/,  {'time_format'=>"%d/%b/%Y:%H:%M:%S %z"}) },
       'none' => Proc.new { NoneParser.new },
       'multiline' => Proc.new { MultilineParser.new },
     }.each { |name, factory|
@@ -640,9 +636,7 @@ module Fluent
     }
 
     def self.register_template(name, regexp_or_proc, time_format=nil)
-      if regexp_or_proc.is_a?(Class)
-        factory = Proc.new { regexp_or_proc.new }
-      elsif regexp_or_proc.is_a?(Regexp)
+      if regexp_or_proc.is_a?(Regexp)
         regexp = regexp_or_proc
         factory = Proc.new { RegexpParser.new(regexp, {'time_format'=>time_format}) }
       else
@@ -652,9 +646,26 @@ module Fluent
       TEMPLATE_REGISTRY.register(name, factory)
     end
 
-    def self.lookup(format)
-      if format.nil?
-        raise ConfigError, "'format' parameter is required"
+    def initialize
+      @parser = nil
+      @estimate_current_event = nil
+    end
+
+    attr_reader :parser
+
+    # SET false BEFORE CONFIGURE, to return nil when time not parsed
+    # 'configure()' may raise errors for unexpected configurations
+    attr_accessor :estimate_current_event
+
+    def configure(conf, required=true)
+      format = conf['format']
+
+      if format == nil
+        if required
+          raise ConfigError, "'format' parameter is required"
+        else
+          return nil
+        end
       end
 
       if format[0] == ?/ && format[format.length-1] == ?/
@@ -668,7 +679,7 @@ module Fluent
           raise ConfigError, "Invalid regexp '#{format[1..-2]}': #{$!}"
         end
 
-        RegexpParser.new(regexp)
+        @parser = RegexpParser.new(regexp, conf)
       else
         # built-in template
         begin
@@ -676,26 +687,9 @@ module Fluent
         rescue ConfigError => e # keep same error message
           raise ConfigError, "Unknown format template '#{format}'"
         end
-
-        factory.call
+        @parser = factory.call
       end
-    end
-
-    def initialize
-      @parser = nil
-      @estimate_current_event = nil
-    end
-
-    attr_reader :parser
-
-    # SET false BEFORE CONFIGURE, to return nil when time not parsed
-    # 'configure()' may raise errors for unexpected configurations
-    attr_accessor :estimate_current_event
-
-    def configure(conf, required=true)
-      format = conf['format']
 
-      @parser = TextParser.lookup(format)
       if ! @estimate_current_event.nil? && @parser.respond_to?(:'estimate_current_event=')
         @parser.estimate_current_event = @estimate_current_event
       end
@@ -709,9 +703,9 @@ module Fluent
 
     def parse(text, &block)
       if block
-        @parser.parse(text, &block)
+        @parser.call(text, &block)
       else # keep backward compatibility. Will be removed at v1
-        return @parser.parse(text)
+        return @parser.call(text)
       end
     end
   end