fluentd 0.10.36 → 0.10.37

data/lib/fluent/match.rb

@@ -16,174 +16,169 @@
 #    limitations under the License.
 #
 module Fluent
+  class Match
+    def initialize(pattern_str, output)
+      patterns = pattern_str.split(/\s+/).map {|str|
+        MatchPattern.create(str)
+      }
+      if patterns.length == 1
+        @pattern = patterns[0]
+      else
+        @pattern = OrMatchPattern.new(patterns)
+      end
+      @output = output
+    end
 
+    attr_reader :output
 
-class Match
-  def initialize(pattern_str, output)
-    patterns = pattern_str.split(/\s+/).map {|str|
-      MatchPattern.create(str)
-    }
-    if patterns.length == 1
-      @pattern = patterns[0]
-    else
-      @pattern = OrMatchPattern.new(patterns)
+    def emit(tag, es)
+      chain = NullOutputChain.instance
+      @output.emit(tag, es, chain)
     end
-    @output = output
-  end
 
-  attr_reader :output
+    def start
+      @output.start
+    end
 
-  def emit(tag, es)
-    chain = NullOutputChain.instance
-    @output.emit(tag, es, chain)
-  end
+    def shutdown
+      @output.shutdown
+    end
 
-  def start
-    @output.start
+    def match(tag)
+      if @pattern.match(tag)
+        return true
+      end
+      return false
+    end
   end
 
-  def shutdown
-    @output.shutdown
-  end
 
-  def match(tag)
-    if @pattern.match(tag)
-      return true
+  class MatchPattern
+    def self.create(str)
+      GlobMatchPattern.new(str)
     end
-    return false
-  end
-end
 
-
-class MatchPattern
-  def self.create(str)
-    GlobMatchPattern.new(str)
+    #def match(str)
+    #end
   end
 
-  #def match(str)
+  ## TODO
+  #class RegexMatchPattern < MatchPattern
+  #  def initialize(regex)
+  #    @regex = regex
+  #  end
+  #
+  #  def match(str)
+  #    @regex.match(str) != nil
+  #  end
   #end
-end
 
-## TODO
-#class RegexMatchPattern < MatchPattern
-#  def initialize(regex)
-#    @regex = regex
-#  end
-#
-#  def match(str)
-#    @regex.match(str) != nil
-#  end
-#end
-
-class GlobMatchPattern < MatchPattern
-  def initialize(pat)
-    stack = []
-    regex = ['']
-    escape = false
-    dot = false
-
-    i = 0
-    while i < pat.length
-      c = pat[i,1]
-
-      if escape
-        regex.last << Regexp.escape(c)
-        escape = false
-        i += 1
-        next
-
-      elsif pat[i,2] == "**"
-        # recursive any
-        if dot
-          regex.last << "(?![^\\.])"
+  class GlobMatchPattern < MatchPattern
+    def initialize(pat)
+      stack = []
+      regex = ['']
+      escape = false
+      dot = false
+
+      i = 0
+      while i < pat.length
+        c = pat[i,1]
+
+        if escape
+          regex.last << Regexp.escape(c)
+          escape = false
+          i += 1
+          next
+
+        elsif pat[i,2] == "**"
+          # recursive any
+          if dot
+            regex.last << "(?![^\\.])"
+            dot = false
+          end
+          if pat[i+2,1] == "."
+            regex.last << "(?:.*\\.|\\A)"
+            i += 3
+          else
+            regex.last << ".*"
+            i += 2
+          end
+          next
+
+        elsif dot
+          regex.last << "\\."
           dot = false
         end
-        if pat[i+2,1] == "."
-          regex.last << "(?:.*\\.|\\A)"
-          i += 3
+
+        if c == "\\"
+          escape = true
+
+        elsif c == "."
+          dot = true
+
+        elsif c == "*"
+          # any
+          regex.last << "[^\\.]*"
+
+          # TODO
+          #elsif c == "["
+          #  # character class
+          #  chars = ''
+          #  while i < pat.length
+          #    c = pat[i,1]
+          #    if c == "]"
+          #      break
+          #    else
+          #      chars << c
+          #    end
+          #    i += 1
+          #  end
+          #  regex.last << '['+Regexp.escape(chars).gsub("\\-",'-')+']'
+
+        elsif c == "{"
+          # or
+          stack.push []
+          regex.push ''
+
+        elsif c == "}" && !stack.empty?
+          stack.last << regex.pop
+          regex.last << Regexp.union(*stack.pop.map {|r| Regexp.new(r) }).to_s
+
+        elsif c == "," && !stack.empty?
+          stack.last << regex.pop
+          regex.push ''
+
+        elsif c =~ /[a-zA-Z0-9_]/
+          regex.last << c
+
         else
-          regex.last << ".*"
-          i += 2
+          regex.last << "\\#{c}"
         end
-        next
 
-      elsif dot
-        regex.last << "\\."
-        dot = false
+        i += 1
       end
 
-      if c == "\\"
-        escape = true
-
-      elsif c == "."
-        dot = true
-
-      elsif c == "*"
-        # any
-        regex.last << "[^\\.]*"
-
-      # TODO
-      #elsif c == "["
-      #  # character class
-      #  chars = ''
-      #  while i < pat.length
-      #    c = pat[i,1]
-      #    if c == "]"
-      #      break
-      #    else
-      #      chars << c
-      #    end
-      #    i += 1
-      #  end
-      #  regex.last << '['+Regexp.escape(chars).gsub("\\-",'-')+']'
-
-      elsif c == "{"
-        # or
-        stack.push []
-        regex.push ''
-
-      elsif c == "}" && !stack.empty?
+      until stack.empty?
         stack.last << regex.pop
-        regex.last << Regexp.union(*stack.pop.map {|r| Regexp.new(r) }).to_s
-
-      elsif c == "," && !stack.empty?
-        stack.last << regex.pop
-        regex.push ''
-
-      elsif c =~ /[a-zA-Z0-9_]/
-        regex.last << c
-
-      else
-        regex.last << "\\#{c}"
+        regex.last << Regexp.union(*stack.pop).to_s
       end
 
-      i += 1
+      @regex = Regexp.new("\\A"+regex.last+"\\Z")
     end
 
-    until stack.empty?
-      stack.last << regex.pop
-      regex.last << Regexp.union(*stack.pop).to_s
+    def match(str)
+      @regex.match(str) != nil
     end
-
-    @regex = Regexp.new("\\A"+regex.last+"\\Z")
-  end
-
-  def match(str)
-    @regex.match(str) != nil
   end
-end
 
 
-class OrMatchPattern < MatchPattern
-  def initialize(patterns)
-    @patterns = patterns
-  end
+  class OrMatchPattern < MatchPattern
+    def initialize(patterns)
+      @patterns = patterns
+    end
 
-  def match(str)
-    @patterns.any? {|pattern| pattern.match(str) }
+    def match(str)
+      @patterns.any? {|pattern| pattern.match(str) }
+    end
   end
 end
-
-
-end
-

data/lib/fluent/mixin.rb

@@ -16,207 +16,203 @@
 #    limitations under the License.
 #
 module Fluent
-
-
-class TimeFormatter
-  def initialize(format, localtime)
-    @tc1 = 0
-    @tc1_str = nil
-    @tc2 = 0
-    @tc2_str = nil
-
-    if format
-      if localtime
-        define_singleton_method(:format_nocache) {|time|
-          Time.at(time).strftime(format)
-        }
+  class TimeFormatter
+    def initialize(format, localtime)
+      @tc1 = 0
+      @tc1_str = nil
+      @tc2 = 0
+      @tc2_str = nil
+
+      if format
+        if localtime
+          define_singleton_method(:format_nocache) {|time|
+            Time.at(time).strftime(format)
+          }
+        else
+          define_singleton_method(:format_nocache) {|time|
+            Time.at(time).utc.strftime(format)
+          }
+        end
       else
-        define_singleton_method(:format_nocache) {|time|
-          Time.at(time).utc.strftime(format)
-        }
+        if localtime
+          define_singleton_method(:format_nocache) {|time|
+            Time.at(time).iso8601
+          }
+        else
+          define_singleton_method(:format_nocache) {|time|
+            Time.at(time).utc.iso8601
+          }
+        end
       end
-    else
-      if localtime
-        define_singleton_method(:format_nocache) {|time|
-          Time.at(time).iso8601
-        }
+    end
+
+    def format(time)
+      if @tc1 == time
+        return @tc1_str
+      elsif @tc2 == time
+        return @tc2_str
       else
-        define_singleton_method(:format_nocache) {|time|
-          Time.at(time).utc.iso8601
-        }
+        str = format_nocache(time)
+        if @tc1 < @tc2
+          @tc1 = time
+          @tc1_str = str
+        else
+          @tc2 = time
+          @tc2_str = str
+        end
+        return str
       end
     end
-  end
 
-  def format(time)
-    if @tc1 == time
-      return @tc1_str
-    elsif @tc2 == time
-      return @tc2_str
-    else
-      str = format_nocache(time)
-      if @tc1 < @tc2
-        @tc1 = time
-        @tc1_str = str
-      else
-        @tc2 = time
-        @tc2_str = str
+    def format_nocache(time)
+      # will be overridden in initialize
+    end
+
+    def self.configure(conf)
+      if time_format = conf['time_format']
+        @time_format = time_format
       end
-      return str
+
+      if localtime = conf['localtime']
+        @localtime = true
+      elsif utc = conf['utc']
+        @localtime = false
+      end
+
+      @timef = new(@time_format, @localtime)
     end
   end
 
-  def format_nocache(time)
-    # will be overridden in initialize
-  end
 
-  def self.configure(conf)
-    if time_format = conf['time_format']
-      @time_format = time_format
+  module RecordFilterMixin
+    def filter_record(tag, time, record)
     end
 
-    if localtime = conf['localtime']
-      @localtime = true
-    elsif utc = conf['utc']
-      @localtime = false
+    def format_stream(tag, es)
+      out = ''
+      es.each {|time,record|
+        tag_temp = tag.dup
+        filter_record(tag_temp, time, record)
+        out << format(tag_temp, time, record)
+      }
+      out
     end
-
-    @timef = new(@time_format, @localtime)
   end
-end
-
 
-module RecordFilterMixin
-  def filter_record(tag, time, record)
-  end
+  module HandleTagNameMixin
+    include RecordFilterMixin
 
-  def format_stream(tag, es)
-    out = ''
-    es.each {|time,record|
-      tag_temp = tag.dup
-      filter_record(tag_temp, time, record)
-      out << format(tag_temp, time, record)
-    }
-    out
-  end
-end
+    attr_accessor :remove_tag_prefix, :remove_tag_suffix, :add_tag_prefix, :add_tag_suffix
+    def configure(conf)
+      super
+      if remove_tag_prefix = conf['remove_tag_prefix']
+        @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_tag_prefix))
+      end
 
-module HandleTagNameMixin
-  include RecordFilterMixin
+      if remove_tag_suffix = conf['remove_tag_suffix']
+        @remove_tag_suffix = Regexp.new(Regexp.escape(remove_tag_suffix) + '$')
+      end
 
-  attr_accessor :remove_tag_prefix, :remove_tag_suffix, :add_tag_prefix, :add_tag_suffix
-  def configure(conf)
-    super
-    if remove_tag_prefix = conf['remove_tag_prefix']
-      @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_tag_prefix))
+      @add_tag_prefix = conf['add_tag_prefix']
+      @add_tag_suffix = conf['add_tag_suffix']
     end
 
-    if remove_tag_suffix = conf['remove_tag_suffix']
-      @remove_tag_suffix = Regexp.new(Regexp.escape(remove_tag_suffix) + '$')
+    def filter_record(tag, time, record)
+      tag.sub!(@remove_tag_prefix, '') if @remove_tag_prefix
+      tag.sub!(@remove_tag_suffix, '') if @remove_tag_suffix
+      tag.insert(0, @add_tag_prefix) if @add_tag_prefix
+      tag << @add_tag_suffix if @add_tag_suffix
+      super(tag, time, record)
     end
-
-    @add_tag_prefix = conf['add_tag_prefix']
-    @add_tag_suffix = conf['add_tag_suffix']
   end
 
-  def filter_record(tag, time, record)
-    tag.sub!(@remove_tag_prefix, '') if @remove_tag_prefix
-    tag.sub!(@remove_tag_suffix, '') if @remove_tag_suffix
-    tag.insert(0, @add_tag_prefix) if @add_tag_prefix
-    tag << @add_tag_suffix if @add_tag_suffix
-    super(tag, time, record)
-  end
-end
-
-module SetTimeKeyMixin
-  include RecordFilterMixin
+  module SetTimeKeyMixin
+    include RecordFilterMixin
 
-  attr_accessor :include_time_key, :time_key, :localtime
+    attr_accessor :include_time_key, :time_key, :localtime
 
-  def configure(conf)
-    super
+    def configure(conf)
+      super
 
-    if s = conf['include_time_key']
-      b = Config.bool_value(s)
-      if s.empty?
-        b = true
-      elsif b == nil
-        raise ConfigError, "Invalid boolean expression '#{s}' for include_time_key parameter"
+      if s = conf['include_time_key']
+        b = Config.bool_value(s)
+        if s.empty?
+          b = true
+        elsif b == nil
+          raise ConfigError, "Invalid boolean expression '#{s}' for include_time_key parameter"
+        end
+        @include_time_key = b
       end
-      @include_time_key = b
-    end
 
-    if @include_time_key
-      if time_key = conf['time_key']
-        @time_key = time_key
-      end
-      unless @time_key
-        @time_key = 'time'
-      end
+      if @include_time_key
+        if time_key = conf['time_key']
+          @time_key = time_key
+        end
+        unless @time_key
+          @time_key = 'time'
+        end
 
-      if time_format = conf['time_format']
-        @time_format = time_format
-      end
+        if time_format = conf['time_format']
+          @time_format = time_format
+        end
 
-      if localtime = conf['localtime']
-        @localtime = true
-      elsif utc = conf['utc']
-        @localtime = false
-      end
+        if localtime = conf['localtime']
+          @localtime = true
+        elsif utc = conf['utc']
+          @localtime = false
+        end
 
-      @timef = TimeFormatter.new(@time_format, @localtime)
+        @timef = TimeFormatter.new(@time_format, @localtime)
 
-    else
-      @include_time_key = false
+      else
+        @include_time_key = false
+      end
     end
-  end
 
-  def filter_record(tag, time, record)
-    super
-    if @include_time_key
-      record[@time_key] = @timef.format(time)
+    def filter_record(tag, time, record)
+      super
+      if @include_time_key
+        record[@time_key] = @timef.format(time)
+      end
     end
   end
-end
 
-module SetTagKeyMixin
-  include RecordFilterMixin
+  module SetTagKeyMixin
+    include RecordFilterMixin
 
-  attr_accessor :include_tag_key, :tag_key
+    attr_accessor :include_tag_key, :tag_key
 
-  def configure(conf)
-    super
+    def configure(conf)
+      super
 
-    if s = conf['include_tag_key']
-      b = Config.bool_value(s)
-      if s.empty?
-        b = true
-      elsif b == nil
-        raise ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter"
+      if s = conf['include_tag_key']
+        b = Config.bool_value(s)
+        if s.empty?
+          b = true
+        elsif b == nil
+          raise ConfigError, "Invalid boolean expression '#{s}' for include_tag_key parameter"
+        end
+        @include_tag_key = b
       end
-      @include_tag_key = b
-    end
 
-    if @include_tag_key
-      if tag_key = conf['tag_key']
-        @tag_key = tag_key
-      end
-      unless @tag_key
-        @tag_key = 'tag'
-      end
+      if @include_tag_key
+        if tag_key = conf['tag_key']
+          @tag_key = tag_key
+        end
+        unless @tag_key
+          @tag_key = 'tag'
+        end
 
-    else
-      @include_tag_key = false
+      else
+        @include_tag_key = false
+      end
     end
-  end
 
-  def filter_record(tag, time, record)
-    super
-    if @include_tag_key
-      record[@tag_key] = tag
+    def filter_record(tag, time, record)
+      super
+      if @include_tag_key
+        record[@tag_key] = tag
+      end
     end
   end
 end
-
-
-end