fluentd 0.12.20 → 0.12.21

data/lib/fluent/plugin/out_exec_filter.rb

@@ -14,7 +14,14 @@
 #    limitations under the License.
 #
 
+require 'yajl'
+
+require 'fluent/output'
+require 'fluent/env'
+require 'fluent/time'
+require 'fluent/timezone'
 require 'fluent/plugin/exec_util'
+require 'fluent/config/error'
 
 module Fluent
   class ExecFilterOutput < BufferedOutput
@@ -28,61 +35,61 @@ module Fluent
     desc 'The command (program) to execute.'
     config_param :command, :string
 
-    config_param :remove_prefix, :string, :default => nil
-    config_param :add_prefix, :string, :default => nil
+    config_param :remove_prefix, :string, default: nil
+    config_param :add_prefix, :string, default: nil
 
     desc "The format used to map the incoming event to the program input.(#{ExecUtil::SUPPORTED_FORMAT.keys.join(',')})"
-    config_param :in_format, :default => :tsv do |val|
+    config_param :in_format, default: :tsv do |val|
       f = ExecUtil::SUPPORTED_FORMAT[val]
       raise ConfigError, "Unsupported in_format '#{val}'" unless f
       f
     end
     desc 'Specify comma-separated values for tsv format.'
-    config_param :in_keys, :default => [] do |val|
+    config_param :in_keys, default: [] do |val|
       val.split(',')
     end
     desc 'The name of the key to use as the event tag.'
-    config_param :in_tag_key, :default => nil
+    config_param :in_tag_key, default: nil
     desc 'The name of the key to use as the event time.'
-    config_param :in_time_key, :default => nil
+    config_param :in_time_key, default: nil
     desc 'The format for event time used when the in_time_key parameter is specified.(Defauls is UNIX time)'
-    config_param :in_time_format, :default => nil
+    config_param :in_time_format, default: nil
 
     desc "The format used to process the program output.(#{ExecUtil::SUPPORTED_FORMAT.keys.join(',')})"
-    config_param :out_format, :default => :tsv do |val|
+    config_param :out_format, default: :tsv do |val|
       f = ExecUtil::SUPPORTED_FORMAT[val]
       raise ConfigError, "Unsupported out_format '#{val}'" unless f
       f
     end
     desc 'Specify comma-separated values for tsv format.'
-    config_param :out_keys, :default => [] do |val|  # for tsv format
+    config_param :out_keys, default: [] do |val|  # for tsv format
       val.split(',')
     end
     desc 'The name of the key to use as the event tag.'
-    config_param :out_tag_key, :default => nil
+    config_param :out_tag_key, default: nil
     desc 'The name of the key to use as the event time.'
-    config_param :out_time_key, :default => nil
+    config_param :out_time_key, default: nil
     desc 'The format for event time used when the in_time_key parameter is specified.(Defauls is UNIX time)'
-    config_param :out_time_format, :default => nil
+    config_param :out_time_format, default: nil
 
-    config_param :tag, :string, :default => nil
+    config_param :tag, :string, default: nil
 
-    config_param :time_key, :string, :default => nil
-    config_param :time_format, :string, :default => nil
+    config_param :time_key, :string, default: nil
+    config_param :time_format, :string, default: nil
 
     desc 'If true, use localtime with in_time_format.'
-    config_param :localtime, :bool, :default => true
+    config_param :localtime, :bool, default: true
     desc 'If true, use timezone with in_time_format.'
-    config_param :timezone, :string, :default => nil
+    config_param :timezone, :string, default: nil
     desc 'The number of spawned process for command.'
-    config_param :num_children, :integer, :default => 1
+    config_param :num_children, :integer, default: 1
 
     desc 'Respawn command when command exit.'
     # nil, 'none' or 0: no respawn, 'inf' or -1: infinite times, positive integer: try to respawn specified times only
-    config_param :child_respawn, :string, :default => nil
+    config_param :child_respawn, :string, default: nil
 
     # 0: output logs for all of messages to emit
-    config_param :suppress_error_log_interval, :time, :default => 0
+    config_param :suppress_error_log_interval, :time, default: 0
 
     config_set_default :flush_interval, 1
 
@@ -306,7 +313,7 @@ module Fluent
           chunk.write_to(@io)
         rescue Errno::EPIPE => e
           # Broken pipe (child process unexpectedly exited)
-          @log.warn "exec_filter Broken pipe, child process maybe exited.", :command => @command
+          @log.warn "exec_filter Broken pipe, child process maybe exited.", command: @command
           if try_respawn
             retry # retry chunk#write_to with child respawned
           else
@@ -329,19 +336,19 @@ module Fluent
 
           @respawns -= 1 if @respawns > 0
         end
-        @log.warn "exec_filter child process successfully respawned.", :command => @command, :respawns => @respawns
+        @log.warn "exec_filter child process successfully respawned.", command: @command, respawns: @respawns
         true
       end
 
       def run
         @parser.call(@io)
       rescue
-        @log.error "exec_filter thread unexpectedly failed with an error.", :command=>@command, :error=>$!.to_s
+        @log.error "exec_filter thread unexpectedly failed with an error.", command: @command, error: $!.to_s
         @log.warn_backtrace $!.backtrace
       ensure
         pid, stat = Process.waitpid2(@pid)
         unless @finished
-          @log.error "exec_filter process unexpectedly exited.", :command=>@command, :ecode=>stat.to_i
+          @log.error "exec_filter process unexpectedly exited.", command: @command, ecode: stat.to_i
           unless @respawns == 0
             @log.warn "exec_filter child process will respawn for next input data (respawns #{@respawns})."
           end
@@ -369,7 +376,7 @@ module Fluent
       router.emit(tag, time, record)
     rescue
       if @suppress_error_log_interval == 0 || Time.now.to_i > @next_log_time
-        log.error "exec_filter failed to emit", :error=>$!.to_s, :error_class=>$!.class.to_s, :record=>Yajl.dump(record)
+        log.error "exec_filter failed to emit", error: $!.to_s, error_class: $!.class.to_s, record: Yajl.dump(record)
         log.warn_backtrace $!.backtrace
         @next_log_time = Time.now.to_i + @suppress_error_log_interval
       end

data/lib/fluent/plugin/out_file.rb

@@ -14,6 +14,12 @@
 #    limitations under the License.
 #
 
+require 'fileutils'
+require 'zlib'
+
+require 'fluent/output'
+require 'fluent/config/error'
+
 module Fluent
   class FileOutput < TimeSlicedOutput
     Plugin.register_output('file', self)
@@ -26,11 +32,11 @@ module Fluent
     desc "The Path of the file."
     config_param :path, :string
     desc "The format of the file content. The default is out_file."
-    config_param :format, :string, :default => 'out_file'
+    config_param :format, :string, default: 'out_file'
     desc "The flushed chunk is appended to existence file or not."
-    config_param :append, :bool, :default => false
+    config_param :append, :bool, default: false
     desc "Compress flushed file."
-    config_param :compress, :default => nil do |val|
+    config_param :compress, default: nil do |val|
       c = SUPPORTED_COMPRESS[val]
       unless c
         raise ConfigError, "Unsupported compression algorithm '#{val}'"
@@ -38,7 +44,7 @@ module Fluent
       c
     end
     desc "Create symlink to temporary buffered file when buffer_type is file."
-    config_param :symlink_path, :string, :default => nil
+    config_param :symlink_path, :string, default: nil
 
     def initialize
       require 'zlib'
@@ -84,7 +90,7 @@ module Fluent
 
     def write(chunk)
       path = generate_path(chunk.key)
-      FileUtils.mkdir_p File.dirname(path), :mode => DEFAULT_DIR_PERMISSION
+      FileUtils.mkdir_p File.dirname(path), mode: DEFAULT_DIR_PERMISSION
 
       case @compress
       when nil

data/lib/fluent/plugin/out_forward.rb

@@ -14,6 +14,15 @@
 #    limitations under the License.
 #
 
+require 'base64'
+require 'socket'
+require 'fileutils'
+
+require 'cool.io'
+
+require 'fluent/output'
+require 'fluent/config/error'
+
 module Fluent
   class ForwardOutputError < StandardError
   end
@@ -29,17 +38,14 @@ module Fluent
 
     def initialize
       super
-      require "base64"
-      require 'socket'
-      require 'fileutils'
       require 'fluent/plugin/socket_util'
       @nodes = []  #=> [Node]
     end
 
     desc 'The timeout time when sending event logs.'
-    config_param :send_timeout, :time, :default => 60
+    config_param :send_timeout, :time, default: 60
     desc 'The transport protocol to use for heartbeats.(udp,tcp,none)'
-    config_param :heartbeat_type, :default => :udp do |val|
+    config_param :heartbeat_type, default: :udp do |val|
       case val.downcase
       when 'tcp'
         :tcp
@@ -52,34 +58,34 @@ module Fluent
       end
     end
     desc 'The interval of the heartbeat packer.'
-    config_param :heartbeat_interval, :time, :default => 1
+    config_param :heartbeat_interval, :time, default: 1
     desc 'The wait time before accepting a server fault recovery.'
-    config_param :recover_wait, :time, :default => 10
+    config_param :recover_wait, :time, default: 10
     desc 'The hard timeout used to detect server failure.'
-    config_param :hard_timeout, :time, :default => 60
+    config_param :hard_timeout, :time, default: 60
     desc 'Set TTL to expire DNS cache in seconds.'
-    config_param :expire_dns_cache, :time, :default => nil  # 0 means disable cache
+    config_param :expire_dns_cache, :time, default: nil  # 0 means disable cache
     desc 'The threshold parameter used to detect server faults.'
-    config_param :phi_threshold, :integer, :default => 16
+    config_param :phi_threshold, :integer, default: 16
     desc 'Use the "Phi accrual failure detector" to detect server failure.'
-    config_param :phi_failure_detector, :bool, :default => true
+    config_param :phi_failure_detector, :bool, default: true
 
     # if any options added that requires extended forward api, fix @extend_internal_protocol
 
     desc 'Change the protocol to at-least-once.'
-    config_param :require_ack_response, :bool, :default => false  # require in_forward to respond with ack
+    config_param :require_ack_response, :bool, default: false  # require in_forward to respond with ack
     desc 'This option is used when require_ack_response is true.'
-    config_param :ack_response_timeout, :time, :default => 190  # 0 means do not wait for ack responses
+    config_param :ack_response_timeout, :time, default: 190  # 0 means do not wait for ack responses
     # Linux default tcp_syn_retries is 5 (in many environment)
     # 3 + 6 + 12 + 24 + 48 + 96 -> 189 (sec)
     desc 'Enable client-side DNS round robin.'
-    config_param :dns_round_robin, :bool, :default => false # heartbeat_type 'udp' is not available for this
+    config_param :dns_round_robin, :bool, default: false # heartbeat_type 'udp' is not available for this
 
     attr_reader :nodes
 
     # backward compatibility
-    config_param :port, :integer, :default => DEFAULT_LISTEN_PORT
-    config_param :host, :string, :default => nil
+    config_param :port, :integer, default: DEFAULT_LISTEN_PORT
+    config_param :host, :string, default: nil
 
     attr_accessor :extend_internal_protocol
 
@@ -138,7 +144,7 @@ module Fluent
         else
           @nodes << Node.new(log, node_conf)
         end
-        log.info "adding forwarding server '#{name}'", :host=>host, :port=>port, :weight=>weight, :plugin_id=>plugin_id
+        log.info "adding forwarding server '#{name}'", host: host, port: port, weight: weight, plugin_id: plugin_id
       }
 
       if @nodes.empty?
@@ -184,7 +190,7 @@ module Fluent
     def run
       @loop.run if @loop
     rescue
-      log.error "unexpected error", :error=>$!.to_s
+      log.error "unexpected error", error: $!.to_s
       log.error_backtrace
     end
 
@@ -229,13 +235,13 @@ module Fluent
           lost_weight += n.weight
         end
       }
-      log.debug "rebuilding weight array", :lost_weight=>lost_weight
+      log.debug "rebuilding weight array", lost_weight: lost_weight
 
       if lost_weight > 0
         standby_nodes.each {|n|
           if n.available?
             regular_nodes << n
-            log.warn "using standby node #{n.host}:#{n.port}", :weight=>n.weight
+            log.warn "using standby node #{n.host}:#{n.port}", weight: n.weight
             lost_weight -= n.weight
             break if lost_weight <= 0
           end
@@ -399,7 +405,7 @@ module Fluent
           end
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK, Errno::EINTR, Errno::ECONNREFUSED
           # TODO log
-          log.debug "failed to send heartbeat packet to #{n.host}:#{n.port}", :error=>$!.to_s
+          log.debug "failed to send heartbeat packet to #{n.host}:#{n.port}", error: $!.to_s
         end
       }
     end
@@ -511,7 +517,7 @@ module Fluent
         end
 
         if @failure.hard_timeout?(now)
-          @log.warn "detached forwarding server '#{@name}'", :host=>@host, :port=>@port, :hard_timeout=>true
+          @log.warn "detached forwarding server '#{@name}'", host: @host, port: @port, hard_timeout: true
           @available = false
           @resolved_host = nil  # expire cached host
           @failure.clear
@@ -522,7 +528,7 @@ module Fluent
           phi = @failure.phi(now)
           #$log.trace "phi '#{@name}'", :host=>@host, :port=>@port, :phi=>phi
           if phi > @conf.phi_threshold
-            @log.warn "detached forwarding server '#{@name}'", :host=>@host, :port=>@port, :phi=>phi
+            @log.warn "detached forwarding server '#{@name}'", host: @host, port: @port, phi: phi
             @available = false
             @resolved_host = nil  # expire cached host
             @failure.clear
@@ -538,7 +544,7 @@ module Fluent
         #@log.trace "heartbeat from '#{@name}'", :host=>@host, :port=>@port, :available=>@available, :sample_size=>@failure.sample_size
         if detect && !@available && @failure.sample_size > @conf.recover_sample_size
           @available = true
-          @log.warn "recovered forwarding server '#{@name}'", :host=>@host, :port=>@port
+          @log.warn "recovered forwarding server '#{@name}'", host: @host, port: @port
           return true
         else
           return nil

data/lib/fluent/plugin/out_null.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/output'
+
 module Fluent
   class NullOutput < Output
     Plugin.register_output('null', self)

data/lib/fluent/plugin/out_relabel.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/output'
+
 module Fluent
   class RelabelOutput < Output
     Plugin.register_output('relabel', self)

data/lib/fluent/plugin/out_roundrobin.rb

@@ -14,6 +14,9 @@
 #    limitations under the License.
 #
 
+require 'fluent/output'
+require 'fluent/config/error'
+
 module Fluent
   class RoundRobinOutput < MultiOutput
     Plugin.register_output('roundrobin', self)

data/lib/fluent/plugin/out_stdout.rb

@@ -14,12 +14,14 @@
 #    limitations under the License.
 #
 
+require 'fluent/output'
+
 module Fluent
   class StdoutOutput < Output
     Plugin.register_output('stdout', self)
 
     desc 'Output format.(json,hash)'
-    config_param :output_type, :default => 'json'
+    config_param :output_type, default: 'json'
 
     def configure(conf)
       super

data/lib/fluent/plugin/out_stream.rb

@@ -14,16 +14,16 @@
 #    limitations under the License.
 #
 
+require 'socket'
+require 'fileutils'
+
+require 'fluent/output'
+require 'fluent/event'
+
 module Fluent
   # obsolete
   class StreamOutput < BufferedOutput
-    def initialize
-      require 'socket'
-      require 'fileutils'
-      super
-    end
-
-    config_param :send_timeout, :time, :default => 60
+    config_param :send_timeout, :time, default: 60
 
     def configure(conf)
       super
@@ -91,7 +91,7 @@ module Fluent
       $log.warn "see 'forward' section in http://docs.fluentd.org/ for the high-availability configuration."
     end
 
-    config_param :port, :integer, :default => DEFAULT_LISTEN_PORT
+    config_param :port, :integer, default: DEFAULT_LISTEN_PORT
     config_param :host, :string
 
     def configure(conf)

data/lib/fluent/plugin/socket_util.rb

@@ -14,13 +14,15 @@
 #    limitations under the License.
 #
 
+require 'ipaddr'
+
 require 'cool.io'
 
+require 'fluent/plugin'
+
 module Fluent
   module SocketUtil
     def create_udp_socket(host)
-      require 'ipaddr'
-
       if IPAddr.new(IPSocket.getaddress(host)).ipv4?
         UDPSocket.new
       else
@@ -43,7 +45,7 @@ module Fluent
         msg.chomp!
         @callback.call(msg, addr)
       rescue => e
-        @log.error "unexpected error", :error => e, :error_class => e.class
+        @log.error "unexpected error", error: e, error_class: e.class
       end
     end
 
@@ -79,7 +81,7 @@ module Fluent
         end
         @buffer.slice!(0, pos) if pos > 0
       rescue => e
-        @log.error "unexpected error", :error => e, :error_class => e.class
+        @log.error "unexpected error", error: e, error_class: e.class
         close
       end
 
@@ -99,12 +101,12 @@ module Fluent
       desc 'The format of the payload.'
       config_param :format, :string
       desc 'The port to listen to.'
-      config_param :port, :integer, :default => 5150
+      config_param :port, :integer, default: 5150
       desc 'The bind address to listen to.'
-      config_param :bind, :string, :default => '0.0.0.0'
+      config_param :bind, :string, default: '0.0.0.0'
       desc "The field name of the client's hostname."
-      config_param :source_host_key, :string, :default => nil
-      config_param :blocking_timeout, :time, :default => 0.5
+      config_param :source_host_key, :string, default: nil
+      config_param :blocking_timeout, :time, default: 0.5
 
       def configure(conf)
         super
@@ -130,7 +132,7 @@ module Fluent
       def run
         @loop.run(@blocking_timeout)
       rescue => e
-        log.error "unexpected error", :error => e, :error_class => e.class
+        log.error "unexpected error", error: e, error_class: e.class
         log.error_backtrace
       end
 
@@ -147,7 +149,7 @@ module Fluent
           router.emit(@tag, time, record)
         }
       rescue => e
-        log.error msg.dump, :error => e, :error_class => e.class, :host => addr[3]
+        log.error msg.dump, error: e, error_class: e.class, host: addr[3]
         log.error_backtrace
       end
     end