fluentd 0.12.20 → 0.12.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4968b695bb1d272edf951c51e3abb784431bc722
-  data.tar.gz: 69f6d6745d9d9a09201477c9f8f84e92734b03eb
+  metadata.gz: f3ebfc83b5cad8bcf24df4510ce05851525b2e9c
+  data.tar.gz: 2de7357213f35b47353654ac302bb0aad0e79a9d
 SHA512:
-  metadata.gz: 26de5771b3a3c686cdfc868d633bee44bc4748713327e57cfe51da3d6a2ba4e5cae28d6bc8b03e0b4419241dc60032bf653b750c8c31b11b48adf3058773fd04
-  data.tar.gz: 65245255419ef81be6697494aa4b2264011d7cbf2e89a2d3c6f7f3a767db68c2caa05c7ae267e9bce1988406e684a9f60e162706d841890c547b5ca40c417757
+  metadata.gz: 1b9a9ec67e34cc1f98064684ea4eefb71a841e825fdee02e3f2f24f74e056810afb768f45fef6c2e1797b56c008665d55074e809611406856571ac768c08fd9f
+  data.tar.gz: 81b7d05a4420c89e81d0f3df0bae67e520f03e272f589fdb67e4902b5c4feffae26a7c0e5ccb2400141bc589fe199bc0642fd46e4e7c901c15bb48ca9e260962

data/ChangeLog

@@ -1,5 +1,28 @@
 # v0.12
 
+## Release 0.12.21 - 2015/03/03
+
+### New features / Enhancement
+
+* output: Use error stream in TimeSlicedOutput#emit
+  https://github.com/fluent/fluentd/pull/791
+* in_tail: Avoid unnecessary open call
+  https://github.com/fluent/fluentd/pull/788
+* in_tail: Add enable_watch_timer option
+  https://github.com/fluent/fluentd/pull/811
+* filter_record_transformer: Relax conditions which auto_typecast is applied when enable_ruby yes
+  https://github.com/fluent/fluentd/pull/817
+* Backport v0.14 refactoring changes
+
+### Bug fixes
+
+* in_tail: Fix input messages loss when receive_lines fail with BufferQueueLimitError
+  https://github.com/fluent/fluentd/pull/810
+* in_monitor_agent: Remove unnecessary fields from API response with debug mode
+  https://github.com/fluent/fluentd/pull/802
+* filter_record_transformer: Fix record_transformer to be thread-safe
+  https://github.com/fluent/fluentd/pull/816
+
 ## Release 0.12.20 - 2015/01/26
 
 ### New features / Enhancement

data/Rakefile

@@ -5,7 +5,7 @@ require 'fileutils'
 require 'rake/testtask'
 require 'rake/clean'
 
-task :test => [:base_test]
+task test: [:base_test]
 
 desc 'Run test_unit based test'
 Rake::TestTask.new(:base_test) do |t|
@@ -30,4 +30,4 @@ task :coverage do |t|
   Rake::Task["test"].invoke
 end
 
-task :default => [:test, :build]
+task default: [:test, :build]

data/bin/fluent-debug

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require 'rubygems' unless defined?(gem)
 here = File.dirname(__FILE__)
 $LOAD_PATH << File.expand_path(File.join(here, '..', 'lib'))
 require 'fluent/command/debug'

data/lib/fluent/agent.rb

@@ -13,10 +13,13 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
-module Fluent
-  require 'fluent/configurable'
-  require 'fluent/engine'
 
+require 'fluent/configurable'
+require 'fluent/engine'
+require 'fluent/plugin'
+require 'fluent/output'
+
+module Fluent
   #
   # Agent is a resource unit who manages emittable plugins
   #
@@ -81,7 +84,7 @@ module Fluent
             log.info "shutting down filter#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(f.class), plugin_id: f.plugin_id
             f.shutdown
           rescue => e
-            log.warn "unexpected error while shutting down filter plugins", :plugin => f.class, :plugin_id => f.plugin_id, :error_class => e.class, :error => e
+            log.warn "unexpected error while shutting down filter plugins", plugin: f.class, plugin_id: f.plugin_id, error_class: e.class, error: e
             log.warn_backtrace
           end
         end
@@ -95,7 +98,7 @@ module Fluent
             log.info "shutting down output#{@context.nil? ? '' : " in #{@context}"}", type: Plugin.lookup_name_from_class(o.class), plugin_id: o.plugin_id
             o.shutdown
           rescue => e
-            log.warn "unexpected error while shutting down output plugins", :plugin => o.class, :plugin_id => o.plugin_id, :error_class => e.class, :error => e
+            log.warn "unexpected error while shutting down output plugins", plugin: o.class, plugin_id: o.plugin_id, error_class: e.class, error: e
             log.warn_backtrace
           end
         end
@@ -115,7 +118,7 @@ module Fluent
             flush_recursive(o.outputs)
           end
         rescue => e
-          log.debug "error while force flushing", :error_class => e.class, :error => e
+          log.debug "error while force flushing", error_class: e.class, error: e
           log.debug_backtrace
         end
       }
@@ -163,16 +166,16 @@ module Fluent
         c = (@count += 1)
         if c < 512
           if Math.log(c) / Math.log(2) % 1.0 == 0
-            @log.warn "no patterns matched", :tag => tag
+            @log.warn "no patterns matched", tag: tag
             return
           end
         else
           if c % 512 == 0
-            @log.warn "no patterns matched", :tag => tag
+            @log.warn "no patterns matched", tag: tag
             return
           end
         end
-        @log.on_trace { @log.trace "no patterns matched", :tag => tag }
+        @log.on_trace { @log.trace "no patterns matched", tag: tag }
       end
 
       def start

data/lib/fluent/buffer.rb

@@ -13,6 +13,12 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
+require 'monitor'
+require 'fileutils'
+
+require 'fluent/configurable'
+
 module Fluent
   class BufferError < StandardError
   end
@@ -140,11 +146,11 @@ module Fluent
     # Local file based plugins which should provide more reliability and efficiency
     # should override buffer_chunk_limit with a larger size.
     desc 'The size of each buffer chunk.'
-    config_param :buffer_chunk_limit, :size, :default => 8*1024*1024
+    config_param :buffer_chunk_limit, :size, default: 8*1024*1024
     desc 'The length limit of the chunk queue.'
-    config_param :buffer_queue_limit, :integer, :default => 256
+    config_param :buffer_queue_limit, :integer, default: 256
     desc 'The action when the size of buffer queue exceeds the buffer_queue_limit.'
-    config_param :buffer_queue_full_action, :enum, :list => [:exception, :block], :default => :exception
+    config_param :buffer_queue_full_action, :enum, list: [:exception, :block], default: :exception
 
     alias chunk_limit buffer_chunk_limit
     alias chunk_limit= buffer_chunk_limit=

data/lib/fluent/command/bundler_injection.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'rbconfig'
+
 if ENV['BUNDLE_BIN_PATH']
   puts 'error: You seem to use `bundle exec` already.'
   exit 1

data/lib/fluent/command/cat.rb

@@ -66,7 +66,7 @@ op.on('--message-key KEY', "key field for none format (default: #{message_key})"
   message_key = s
 }
 
-(class<<self;self;end).module_eval do
+(class << self; self; end).module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg

data/lib/fluent/command/debug.rb

@@ -34,7 +34,7 @@ op.on('-u', '--unix PATH', "use unix socket instead of tcp") {|b|
   unix = b
 }
 
-(class<<self;self;end).module_eval do
+(class << self; self; end).module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg
@@ -60,7 +60,8 @@ else
   uri = "druby://#{host}:#{port}"
 end
 
-require 'fluent/load'
+require 'fluent/log'
+require 'fluent/engine'
 
 $log = Fluent::Log.new(STDERR, Fluent::Log::LEVEL_TRACE)
 Fluent::Engine.init

data/lib/fluent/command/fluentd.rb

@@ -15,7 +15,9 @@
 #
 
 require 'optparse'
+
 require 'fluent/supervisor'
+require 'fluent/version'
 
 op = OptionParser.new
 op.version = Fluent::VERSION
@@ -119,7 +121,7 @@ op.on('-G', '--gem-path GEM_INSTALL_PATH', "Gemfile install path (default: $(dir
   opts[:gem_install_path] = s
 }
 
-(class<<self;self;end).module_eval do
+(class << self; self; end).module_eval do
   define_method(:usage) do |msg|
     puts op.to_s
     puts "error: #{msg}" if msg

data/lib/fluent/config.rb

@@ -14,10 +14,11 @@
 #    limitations under the License.
 #
 
-module Fluent
-  require 'fluent/config/error'
-  require 'fluent/config/element'
+require 'fluent/config/error'
+require 'fluent/config/element'
+require 'fluent/configurable'
 
+module Fluent
   module Config
     def self.parse(str, fname, basepath = Dir.pwd, v1_config = false)
       if fname =~ /\.rb$/
@@ -39,8 +40,6 @@ module Fluent
     end
   end
 
-  require 'fluent/configurable'
-
   module PluginId
     def configure(conf)
       @id = conf['@id'] || conf['id']

data/lib/fluent/config/basic_parser.rb

@@ -14,12 +14,11 @@
 #    limitations under the License.
 #
 
+require 'stringio'
+require 'fluent/config/error'
+
 module Fluent
   module Config
-
-    require 'stringio'
-    require 'fluent/config/error'
-
     class BasicParser
       def initialize(strscan)
         @ss = strscan

data/lib/fluent/config/configure_proxy.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/configurable'
+
 module Fluent
   module Config
     class ConfigureProxy

data/lib/fluent/config/dsl.rb

@@ -14,7 +14,10 @@
 #    limitations under the License.
 #
 
+require 'json'
+
 require 'fluent/config'
+require 'fluent/config/element'
 
 module Fluent
   module Config

data/lib/fluent/config/element.rb

@@ -14,9 +14,10 @@
 #    limitations under the License.
 #
 
-module Fluent
-  require 'fluent/config/error'
+require 'fluent/config/error'
+require 'fluent/config/literal_parser'
 
+module Fluent
   module Config
     class Element < Hash
       def initialize(name, arg, attrs, elements, unused = nil)

data/lib/fluent/config/literal_parser.rb

@@ -14,13 +14,16 @@
 #    limitations under the License.
 #
 
-module Fluent
-  module Config
+require 'stringio'
+
+require 'json'
+require 'yajl'
+require 'irb/ruby-lex'  # RubyLex
 
-    require 'yajl'
-    require 'fluent/config/basic_parser'
-    require 'irb/ruby-lex'  # RubyLex
+require 'fluent/config/basic_parser'
 
+module Fluent
+  module Config
     class LiteralParser < BasicParser
       def self.unescape_char(c)
         case c

data/lib/fluent/config/parser.rb

@@ -14,11 +14,13 @@
 #    limitations under the License.
 #
 
+require 'uri'
+
+require 'fluent/config/error'
+require 'fluent/config/element'
+
 module Fluent
   module Config
-    require 'fluent/config/error'
-    require 'fluent/config/element'
-
     class Parser
       def self.parse(io, fname, basepath = Dir.pwd)
         attrs, elems = Parser.new(basepath, io.each_line, fname).parse!(true)

data/lib/fluent/config/section.rb

@@ -16,10 +16,10 @@
 
 require 'json'
 
-module Fluent
-  require 'fluent/config/error'
-  require 'fluent/config/v1_parser'
+require 'fluent/config/error'
+require 'fluent/config/v1_parser'
 
+module Fluent
   module Config
     class Section < BasicObject
       def self.name

data/lib/fluent/config/types.rb

@@ -14,9 +14,12 @@
 #    limitations under the License.
 #
 
-module Fluent
-  require 'json'
+require 'json'
+
+require 'fluent/config/error'
+require 'fluent/configurable'
 
+module Fluent
   module Config
     def self.size_value(str)
       case str.to_s
@@ -61,54 +64,45 @@ module Fluent
         nil
       end
     end
-  end
-
-  Configurable.register_type(:string, Proc.new { |val, opts|
-    val
-  })
-
-  Configurable.register_type(:enum, Proc.new { |val, opts|
-    s = val.to_sym
-    raise "Plugin BUG: config type 'enum' requires :list argument" unless opts[:list].is_a?(Array)
-    unless opts[:list].include?(s)
-      raise ConfigError, "valid options are #{opts[:list].join(',')} but got #{val}"
-    end
-    s
-  })
-
-  Configurable.register_type(:integer, Proc.new { |val, opts|
-    val.to_i
-  })
-
-  Configurable.register_type(:float, Proc.new { |val, opts|
-    val.to_f
-  })
 
-  Configurable.register_type(:size, Proc.new { |val, opts|
-    Config.size_value(val)
-  })
-
-  Configurable.register_type(:bool, Proc.new { |val, opts|
-    Config.bool_value(val)
-  })
-
-  Configurable.register_type(:time, Proc.new { |val, opts|
-    Config.time_value(val)
-  })
-
-  Configurable.register_type(:hash, Proc.new { |val, opts|
-    param = val.is_a?(String) ? JSON.load(val) : val
-    if param.class != Hash
-      raise ConfigError, "hash required but got #{val.inspect}"
-    end
-    param
-  })
+    STRING_TYPE = Proc.new { |val, opts| val }
+    ENUM_TYPE = Proc.new { |val, opts|
+      s = val.to_sym
+      list = opts[:list]
+      raise "Plugin BUG: config type 'enum' requires :list of symbols" unless list.is_a?(Array) && list.all?{|v| v.is_a? Symbol }
+      unless list.include?(s)
+        raise ConfigError, "valid options are #{list.join(',')} but got #{val}"
+      end
+      s
+    }
+    INTEGER_TYPE = Proc.new { |val, opts| val.to_i }
+    FLOAT_TYPE = Proc.new { |val, opts| val.to_f }
+    SIZE_TYPE = Proc.new { |val, opts| Config.size_value(val) }
+    BOOL_TYPE = Proc.new { |val, opts| Config.bool_value(val) }
+    TIME_TYPE = Proc.new { |val, opts| Config.time_value(val) }
+    HASH_TYPE = Proc.new { |val, opts|
+      param = val.is_a?(String) ? JSON.load(val) : val
+      if param.class != Hash
+        raise ConfigError, "hash required but got #{val.inspect}"
+      end
+      param
+    }
+    ARRAY_TYPE = Proc.new { |val, opts|
+      param = val.is_a?(String) ? JSON.load(val) : val
+      if param.class != Array
+        raise ConfigError, "array required but got #{val.inspect}"
+      end
+      param
+    }
+  end
 
-  Configurable.register_type(:array, Proc.new { |val, opts|
-    param = val.is_a?(String) ? JSON.load(val) : val
-    if param.class != Array
-      raise ConfigError, "array required but got #{val.inspect}"
-    end
-    param
-  })
+  Configurable.register_type(:string,  Config::STRING_TYPE)
+  Configurable.register_type(:enum,    Config::ENUM_TYPE)
+  Configurable.register_type(:integer, Config::INTEGER_TYPE)
+  Configurable.register_type(:float,   Config::FLOAT_TYPE)
+  Configurable.register_type(:size,    Config::SIZE_TYPE)
+  Configurable.register_type(:bool,    Config::BOOL_TYPE)
+  Configurable.register_type(:time,    Config::TIME_TYPE)
+  Configurable.register_type(:hash,    Config::HASH_TYPE)
+  Configurable.register_type(:array,   Config::ARRAY_TYPE)
 end