fluentd 0.12.20 → 0.12.21

data/lib/fluent/plugin/filter_stdout.rb

@@ -14,6 +14,9 @@
 #    limitations under the License.
 #
 
+require 'fluent/filter'
+require 'fluent/plugin'
+
 module Fluent
   class StdoutFilter < Filter
     Plugin.register_filter('stdout', self)
@@ -22,7 +25,7 @@ module Fluent
     attr_reader :formatter
 
     desc 'The format of the output.'
-    config_param :format, :string, :default => 'stdout'
+    config_param :format, :string, default: 'stdout'
     # config_param :output_type, :string, :default => 'json' (StdoutFormatter defines this)
 
     def configure(conf)

data/lib/fluent/plugin/in_debug_agent.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/input'
+
 module Fluent
   class DebugAgentInput < Input
     Plugin.register_input('debug_agent', self)
@@ -24,11 +26,11 @@ module Fluent
       super
     end
 
-    config_param :bind, :string, :default => '0.0.0.0'
-    config_param :port, :integer, :default => 24230
-    config_param :unix_path, :string, :default => nil
+    config_param :bind, :string, default: '0.0.0.0'
+    config_param :port, :integer, default: 24230
+    config_param :unix_path, :string, default: nil
     #config_param :unix_mode  # TODO
-    config_param :object, :string, :default => 'Engine'
+    config_param :object, :string, default: 'Engine'
 
     def configure(conf)
       super
@@ -46,7 +48,7 @@ module Fluent
       else
         uri = "druby://#{@bind}:#{@port}"
       end
-      log.info "listening dRuby", :uri => uri, :object => @object
+      log.info "listening dRuby", uri: uri, object: @object
       obj = eval(@object)
       @server = DRb::DRbServer.new(uri, obj)
     end

data/lib/fluent/plugin/in_dummy.rb

@@ -14,6 +14,11 @@
 #    limitations under the License.
 #
 
+require 'json'
+
+require 'fluent/input'
+require 'fluent/config/error'
+
 module Fluent
   class DummyInput < Input
     Fluent::Plugin.register_input('dummy', self)
@@ -23,11 +28,11 @@ module Fluent
     desc "The value is the tag assigned to the generated events."
     config_param :tag, :string
     desc "It configures how many events to generate per second."
-    config_param :rate, :integer, :default => 1
+    config_param :rate, :integer, default: 1
     desc "If specified, each generated event has an auto-incremented key field."
-    config_param :auto_increment_key, :string, :default => nil
+    config_param :auto_increment_key, :string, default: nil
     desc "The dummy data to be generated. An array of JSON hashes or a single JSON hash."
-    config_param :dummy, :default => [{"message"=>"dummy"}] do |val|
+    config_param :dummy, default: [{"message"=>"dummy"}] do |val|
       begin
         parsed = JSON.parse(val)
       rescue JSON::ParserError => e

data/lib/fluent/plugin/in_exec.rb

@@ -14,6 +14,13 @@
 #    limitations under the License.
 #
 
+require 'yajl'
+
+require 'fluent/input'
+require 'fluent/time'
+require 'fluent/timezone'
+require 'fluent/config/error'
+
 module Fluent
   class ExecInput < Input
     Plugin.register_input('exec', self)
@@ -21,27 +28,26 @@ module Fluent
     def initialize
       super
       require 'fluent/plugin/exec_util'
-      require 'fluent/timezone'
     end
 
     desc 'The command (program) to execute.'
     config_param :command, :string
     desc 'The format used to map the program output to the incoming event.(tsv,json,msgpack)'
-    config_param :format, :string, :default => 'tsv'
+    config_param :format, :string, default: 'tsv'
     desc 'Specify the comma-separated keys when using the tsv format.'
-    config_param :keys, :default => [] do |val|
+    config_param :keys, default: [] do |val|
       val.split(',')
     end
     desc 'Tag of the output events.'
-    config_param :tag, :string, :default => nil
+    config_param :tag, :string, default: nil
     desc 'The key to use as the event tag instead of the value in the event record. '
-    config_param :tag_key, :string, :default => nil
+    config_param :tag_key, :string, default: nil
     desc 'The key to use as the event time instead of the value in the event record.'
-    config_param :time_key, :string, :default => nil
+    config_param :time_key, :string, default: nil
     desc 'The format of the event time used for the time_key parameter.'
-    config_param :time_format, :string, :default => nil
+    config_param :time_format, :string, default: nil
     desc 'The interval time between periodic program runs.'
-    config_param :run_interval, :time, :default => nil
+    config_param :run_interval, :time, default: nil
 
     def configure(conf)
       super
@@ -136,7 +142,7 @@ module Fluent
           Process.waitpid(io.pid)
           sleep @run_interval
         rescue
-          log.error "exec failed to run or shutdown child process", :error => $!.to_s, :error_class => $!.class.to_s
+          log.error "exec failed to run or shutdown child process", error: $!.to_s, error_class: $!.class.to_s
           log.warn_backtrace $!.backtrace
         end
       end
@@ -163,7 +169,7 @@ module Fluent
 
       router.emit(tag, time, record)
     rescue => e
-      log.error "exec failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => tag, :record => Yajl.dump(record)
+      log.error "exec failed to emit", error: e.to_s, error_class: e.class.to_s, tag: tag, record: Yajl.dump(record)
     end
   end
 end

data/lib/fluent/plugin/in_forward.rb

@@ -14,6 +14,13 @@
 #    limitations under the License.
 #
 
+require 'fcntl'
+
+require 'cool.io'
+require 'yajl'
+
+require 'fluent/input'
+
 module Fluent
   class ForwardInput < Input
     Plugin.register_input('forward', self)
@@ -24,22 +31,22 @@ module Fluent
     end
 
     desc 'The port to listen to.'
-    config_param :port, :integer, :default => DEFAULT_LISTEN_PORT
+    config_param :port, :integer, default: DEFAULT_LISTEN_PORT
     desc 'The bind address to listen to.'
-    config_param :bind, :string, :default => '0.0.0.0'
-    config_param :backlog, :integer, :default => nil
+    config_param :bind, :string, default: '0.0.0.0'
+    config_param :backlog, :integer, default: nil
     # SO_LINGER 0 to send RST rather than FIN to avoid lots of connections sitting in TIME_WAIT at src
     desc 'The timeout time used to set linger option.'
-    config_param :linger_timeout, :integer, :default => 0
+    config_param :linger_timeout, :integer, default: 0
     # This option is for Cool.io's loop wait timeout to avoid loop stuck at shutdown. Almost users don't need to change this value.
-    config_param :blocking_timeout, :time, :default => 0.5
+    config_param :blocking_timeout, :time, default: 0.5
 
     desc 'Log warning if received chunk size is larger than this value.'
-    config_param :chunk_size_warn_limit, :size, :default => nil
+    config_param :chunk_size_warn_limit, :size, default: nil
     desc 'Received chunk is dropped if it is larger than this value.'
-    config_param :chunk_size_limit, :size, :default => nil
+    config_param :chunk_size_limit, :size, default: nil
     desc 'Skip an event if incoming event is invalid.'
-    config_param :skip_invalid_event, :bool, :default => false
+    config_param :skip_invalid_event, :bool, default: false
 
     def configure(conf)
       super
@@ -97,7 +104,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
 
@@ -265,7 +272,7 @@ module Fluent
         @chunk_counter += data.bytesize
         @y << data
       rescue => e
-        @log.error "forward error", :error => e, :error_class => e.class
+        @log.error "forward error", error: e, error_class: e.class
         @log.error_backtrace
         close
       end
@@ -278,7 +285,7 @@ module Fluent
           @chunk_counter = 0
         end
       rescue => e
-        @log.error "forward error", :error => e, :error_class => e.class
+        @log.error "forward error", error: e, error_class: e.class
         @log.error_backtrace
         close
       end

data/lib/fluent/plugin/in_gc_stat.rb

@@ -14,6 +14,10 @@
 #    limitations under the License.
 #
 
+require 'cool.io'
+
+require 'fluent/input'
+
 module Fluent
   class GCStatInput < Input
     Plugin.register_input('gc_stat', self)
@@ -22,7 +26,7 @@ module Fluent
       super
     end
 
-    config_param :emit_interval, :time, :default => 60
+    config_param :emit_interval, :time, default: 60
     config_param :tag, :string
 
     class TimerWatcher < Coolio::TimerWatcher
@@ -61,7 +65,7 @@ module Fluent
     def run
       @loop.run
     rescue
-      log.error "unexpected error", :error=>$!.to_s
+      log.error "unexpected error", error: $!.to_s
       log.error_backtrace
     end
 

data/lib/fluent/plugin/in_http.rb

@@ -14,6 +14,16 @@
 #    limitations under the License.
 #
 
+require 'uri'
+require 'socket'
+require 'json'
+
+require 'cool.io'
+
+require 'fluent/input'
+require 'fluent/event'
+require 'fluent/process'
+
 module Fluent
   class HttpInput < Input
     Plugin.register_input('http', self)
@@ -24,32 +34,31 @@ module Fluent
 
     def initialize
       require 'webrick/httputils'
-      require 'uri'
       super
     end
 
     EMPTY_GIF_IMAGE = "GIF89a\u0001\u0000\u0001\u0000\x80\xFF\u0000\xFF\xFF\xFF\u0000\u0000\u0000,\u0000\u0000\u0000\u0000\u0001\u0000\u0001\u0000\u0000\u0002\u0002D\u0001\u0000;".force_encoding("UTF-8")
 
     desc 'The port to listen to.'
-    config_param :port, :integer, :default => 9880
+    config_param :port, :integer, default: 9880
     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 size limit of the POSTed element. Default is 32MB.'
-    config_param :body_size_limit, :size, :default => 32*1024*1024  # TODO default
+    config_param :body_size_limit, :size, default: 32*1024*1024  # TODO default
     desc 'The timeout limit for keeping the connection alive.'
-    config_param :keepalive_timeout, :time, :default => 10   # TODO default
-    config_param :backlog, :integer, :default => nil
+    config_param :keepalive_timeout, :time, default: 10   # TODO default
+    config_param :backlog, :integer, default: nil
     desc 'Add HTTP_ prefix headers to the record.'
-    config_param :add_http_headers, :bool, :default => false
+    config_param :add_http_headers, :bool, default: false
     desc 'Add REMOTE_ADDR header to the record.'
-    config_param :add_remote_addr, :bool, :default => false
+    config_param :add_remote_addr, :bool, default: false
     desc 'The format of the HTTP body.'
-    config_param :format, :string, :default => 'default'
-    config_param :blocking_timeout, :time, :default => 0.5
+    config_param :format, :string, default: 'default'
+    config_param :blocking_timeout, :time, default: 0.5
     desc 'Set a white list of domains that can do CORS (Cross-Origin Resource Sharing)'
-    config_param :cors_allow_origins, :array, :default => nil
+    config_param :cors_allow_origins, :array, default: nil
     desc 'Respond with empty gif image of 1x1 pixel.'
-    config_param :respond_with_empty_img, :bool, :default => false
+    config_param :respond_with_empty_img, :bool, default: false
 
     def configure(conf)
       super
@@ -121,7 +130,7 @@ module Fluent
     def run
       @loop.run(@blocking_timeout)
     rescue
-      log.error "unexpected error", :error=>$!.to_s
+      log.error "unexpected error", error: $!.to_s
       log.error_backtrace
     end
 
@@ -254,7 +263,7 @@ module Fluent
         @idle = 0
         @parser << data
       rescue
-        @log.warn "unexpected error", :error=>$!.to_s
+        @log.warn "unexpected error", error: $!.to_s
         @log.warn_backtrace
         close
       end

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -14,21 +14,24 @@
 #    limitations under the License.
 #
 
+require 'json'
+require 'webrick'
+require 'cgi'
+
+require 'cool.io'
+
+require 'fluent/input'
+require 'fluent/output'
+require 'fluent/filter'
+
 module Fluent
   class MonitorAgentInput < Input
     Plugin.register_input('monitor_agent', self)
 
-    require 'webrick'
-
-    def initialize
-      require 'cgi'
-      super
-    end
-
-    config_param :bind, :string, :default => '0.0.0.0'
-    config_param :port, :integer, :default => 24220
-    config_param :tag, :string, :default => nil
-    config_param :emit_interval, :time, :default => 60
+    config_param :bind, :string, default: '0.0.0.0'
+    config_param :port, :integer, default: 24220
+    config_param :tag, :string, default: nil
+    config_param :emit_interval, :time, default: 60
 
     class MonitorServlet < WEBrick::HTTPServlet::AbstractServlet
       def initialize(server, agent)
@@ -234,10 +237,10 @@ module Fluent
     def start
       log.debug "listening monitoring http server on http://#{@bind}:#{@port}/api/plugins"
       @srv = WEBrick::HTTPServer.new({
-          :BindAddress => @bind,
-          :Port => @port,
-          :Logger => WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
-          :AccessLog => [],
+          BindAddress: @bind,
+          Port: @port,
+          Logger: WEBrick::Log.new(STDERR, WEBrick::Log::FATAL),
+          AccessLog: [],
         })
       @srv.mount('/api/plugins', LTSVMonitorServlet, self)
       @srv.mount('/api/plugins.json', JSONMonitorServlet, self)
@@ -250,7 +253,7 @@ module Fluent
         log.debug "tag parameter is specified. Emit plugins info to '#{@tag}'"
 
         @loop = Coolio::Loop.new
-        opts = {:with_config => false}
+        opts = {with_config: false}
         timer = TimerWatcher.new(@emit_interval, log) {
           es = MultiEventStream.new
           now = Engine.now
@@ -267,7 +270,7 @@ module Fluent
     def run
       @loop.run
     rescue => e
-      log.error "unexpected error", :error => e.to_s
+      log.error "unexpected error", error: e.to_s
       log.error_backtrace
     end
 
@@ -374,6 +377,9 @@ module Fluent
       }
     end
 
+    # TODO: use %i() after drop ruby v1.9.3 support.
+    IGNORE_ATTRIBUTES = %W(@config_root_section @config @masked_config).map(&:to_sym)
+
     # get monitor info from the plugin `pe` and return a hash object
     def get_monitor_info(pe, opts={})
       obj = {}
@@ -397,6 +403,7 @@ module Fluent
         iv = {}
         pe.instance_eval do
           instance_variables.each {|sym|
+            next if IGNORE_ATTRIBUTES.include?(sym)
             key = sym.to_s[1..-1]  # removes first '@'
             iv[key] = instance_variable_get(sym)
           }

data/lib/fluent/plugin/in_object_space.rb

@@ -14,6 +14,11 @@
 #    limitations under the License.
 #
 
+require 'cool.io'
+require 'yajl'
+
+require 'fluent/input'
+
 module Fluent
   class ObjectSpaceInput < Input
     Plugin.register_input('object_space', self)
@@ -22,9 +27,9 @@ module Fluent
       super
     end
 
-    config_param :emit_interval, :time, :default => 60
+    config_param :emit_interval, :time, default: 60
     config_param :tag, :string
-    config_param :top, :integer, :default => 15
+    config_param :top, :integer, default: 15
 
     class TimerWatcher < Coolio::TimerWatcher
       def initialize(interval, repeat, log, &callback)
@@ -62,7 +67,7 @@ module Fluent
     def run
       @loop.run
     rescue
-      log.error "unexpected error", :error=>$!.to_s
+      log.error "unexpected error", error: $!.to_s
       log.error_backtrace
     end
 
@@ -110,7 +115,7 @@ module Fluent
 
       router.emit(@tag, now, record)
     rescue => e
-      log.error "object space failed to emit", :error => e.to_s, :error_class => e.class.to_s, :tag => @tag, :record => Yajl.dump(record)
+      log.error "object space failed to emit", error: e.to_s, error_class: e.class.to_s, tag: @tag, record: Yajl.dump(record)
     end
   end
 end