fluentd 0.10.35 → 0.10.36

data/lib/fluent/plugin/out_null.rb

@@ -16,29 +16,25 @@
 #    limitations under the License.
 #
 module Fluent
+  class NullOutput < Output
+    Plugin.register_output('null', self)
 
+    def initialize
+      super
+    end
 
-class NullOutput < Output
-  Plugin.register_output('null', self)
+    def configure(conf)
+      super
+    end
 
-  def initialize
-    super
-  end
+    def start
+    end
 
-  def configure(conf)
-    super
-  end
+    def shutdown
+    end
 
-  def start
+    def emit(tag, es, chain)
+      chain.next
+    end
   end
-
-  def shutdown
-  end
-
-  def emit(tag, es, chain)
-    chain.next
-  end
-end
-
-
 end

data/lib/fluent/plugin/out_roundrobin.rb

@@ -16,85 +16,80 @@
 #    limitations under the License.
 #
 module Fluent
+  class RoundRobinOutput < MultiOutput
+    Plugin.register_output('roundrobin', self)
 
+    def initialize
+      @outputs = []
+      @weights = []
+    end
 
-class RoundRobinOutput < MultiOutput
-  Plugin.register_output('roundrobin', self)
-
-  def initialize
-    @outputs = []
-    @weights = []
-  end
-
-  attr_reader :outputs, :weights
-  attr_accessor :rand_seed
-
-  def configure(conf)
-    conf.elements.select {|e|
-      e.name == 'store'
-    }.each {|e|
-      type = e['type']
-      unless type
-        raise ConfigError, "Missing 'type' parameter on <store> directive"
-      end
-
-      weight = e['weight']
-      weight = weight ? weight.to_i : 1
-      $log.debug "adding store type=#{type.dump}, weight=#{weight}"
-
-      output = Plugin.new_output(type)
-      output.configure(e)
-      @outputs << output
-      @weights << weight
-    }
-    @rr = -1  # starts from @output[0]
-    @rand_seed = Random.new.seed
-  end
+    attr_reader :outputs, :weights
+    attr_accessor :rand_seed
+
+    def configure(conf)
+      conf.elements.select {|e|
+        e.name == 'store'
+      }.each {|e|
+        type = e['type']
+        unless type
+          raise ConfigError, "Missing 'type' parameter on <store> directive"
+        end
+
+        weight = e['weight']
+        weight = weight ? weight.to_i : 1
+        $log.debug "adding store type=#{type.dump}, weight=#{weight}"
+
+        output = Plugin.new_output(type)
+        output.configure(e)
+        @outputs << output
+        @weights << weight
+      }
+      @rr = -1  # starts from @output[0]
+      @rand_seed = Random.new.seed
+    end
 
-  def start
-    rebuild_weight_array
+    def start
+      rebuild_weight_array
 
-    @outputs.each {|o|
-      o.start
-    }
-  end
+      @outputs.each {|o|
+        o.start
+      }
+    end
 
-  def shutdown
-    @outputs.each {|o|
-      o.shutdown
-    }
-  end
+    def shutdown
+      @outputs.each {|o|
+        o.shutdown
+      }
+    end
 
-  def emit(tag, es, chain)
-    next_output.emit(tag, es, chain)
-  end
+    def emit(tag, es, chain)
+      next_output.emit(tag, es, chain)
+    end
 
-  protected
-  def next_output
-    @rr = 0 if (@rr += 1) >= @weight_array.size
-    @weight_array[@rr]
-  end
+    protected
+    def next_output
+      @rr = 0 if (@rr += 1) >= @weight_array.size
+      @weight_array[@rr]
+    end
 
-  def rebuild_weight_array
-    gcd = @weights.inject(0) {|r,w| r.gcd(w) }
+    def rebuild_weight_array
+      gcd = @weights.inject(0) {|r,w| r.gcd(w) }
 
-    weight_array = []
-    @outputs.zip(@weights).each {|output,weight|
-      (weight / gcd).times {
-        weight_array << output
+      weight_array = []
+      @outputs.zip(@weights).each {|output,weight|
+        (weight / gcd).times {
+          weight_array << output
+        }
       }
-    }
 
-    # don't randomize order if all weight is 1 (=default)
-    if @weights.any? {|w| w > 1 }
-      r = Random.new(@rand_seed)
-      weight_array.sort_by! { r.rand }
-    end
+      # don't randomize order if all weight is 1 (=default)
+      if @weights.any? {|w| w > 1 }
+        r = Random.new(@rand_seed)
+        weight_array.sort_by! { r.rand }
+      end
 
-    @weight_array = weight_array
+      @weight_array = weight_array
+    end
   end
 end
-
-
-end
-

data/lib/fluent/plugin/out_stdout.rb

@@ -16,21 +16,16 @@
 #    limitations under the License.
 #
 module Fluent
+  class StdoutOutput < Output
+    Plugin.register_output('stdout', self)
 
+    def emit(tag, es, chain)
+      es.each {|time,record|
+        $log.write "#{Time.at(time).localtime} #{tag}: #{Yajl.dump(record)}\n"
+      }
+      $log.flush
 
-class StdoutOutput < Output
-  Plugin.register_output('stdout', self)
-
-  def emit(tag, es, chain)
-    es.each {|time,record|
-      $log.write "#{Time.at(time).localtime} #{tag}: #{Yajl.dump(record)}\n"
-    }
-    $log.flush
-
-    chain.next
+      chain.next
+    end
   end
 end
-
-
-end
-

data/lib/fluent/plugin/out_stream.rb

@@ -16,118 +16,111 @@
 #    limitations under the License.
 #
 module Fluent
+  # obsolete
+  class StreamOutput < BufferedOutput
+    def initialize
+      require 'socket'
+      require 'fileutils'
+      super
+    end
 
+    config_param :send_timeout, :time, :default => 60
 
-# obsolete
-class StreamOutput < BufferedOutput
-  def initialize
-    require 'socket'
-    require 'fileutils'
-    super
-  end
-
-  config_param :send_timeout, :time, :default => 60
-
-  def configure(conf)
-    super
-  end
-
-  def format_stream(tag, es)
-    # use PackedForward
-    [tag, es.to_msgpack_stream].to_msgpack
-  end
-
-  def write(chunk)
-    sock = connect
-    begin
-      opt = [1, @send_timeout.to_i].pack('I!I!')  # { int l_onoff; int l_linger; }
-      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, opt)
-
-      opt = [@send_timeout.to_i, 0].pack('L!L!')  # struct timeval
-      sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, opt)
+    def configure(conf)
+      super
+    end
 
-      chunk.write_to(sock)
-    ensure
-      sock.close
+    def format_stream(tag, es)
+      # use PackedForward
+      [tag, es.to_msgpack_stream].to_msgpack
     end
-  end
 
-  def flush_secondary(secondary)
-    unless secondary.is_a?(StreamOutput)
-      secondary = ReformatWriter.new(secondary)
+    def write(chunk)
+      sock = connect
+      begin
+        opt = [1, @send_timeout.to_i].pack('I!I!')  # { int l_onoff; int l_linger; }
+        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, opt)
+
+        opt = [@send_timeout.to_i, 0].pack('L!L!')  # struct timeval
+        sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_SNDTIMEO, opt)
+
+        chunk.write_to(sock)
+      ensure
+        sock.close
+      end
     end
-    @buffer.pop(secondary)
-  end
 
-  class ReformatWriter
-    def initialize(secondary)
-      @secondary = secondary
+    def flush_secondary(secondary)
+      unless secondary.is_a?(StreamOutput)
+        secondary = ReformatWriter.new(secondary)
+      end
+      @buffer.pop(secondary)
     end
 
-    def write(chunk)
-      chain = NullOutputChain.instance
-      chunk.open {|io|
-        # TODO use MessagePackIoEventStream
-        u = MessagePack::Unpacker.new(io)
-        begin
-          u.each {|(tag,entries)|
-            es = MultiEventStream.new
-            entries.each {|o|
-              es.add(o[0], o[1])
+    class ReformatWriter
+      def initialize(secondary)
+        @secondary = secondary
+      end
+
+      def write(chunk)
+        chain = NullOutputChain.instance
+        chunk.open {|io|
+          # TODO use MessagePackIoEventStream
+          u = MessagePack::Unpacker.new(io)
+          begin
+            u.each {|(tag,entries)|
+              es = MultiEventStream.new
+              entries.each {|o|
+                es.add(o[0], o[1])
+              }
+              @secondary.emit(tag, es, chain)
             }
-            @secondary.emit(tag, es, chain)
-          }
-        rescue EOFError
-        end
-      }
+          rescue EOFError
+          end
+        }
+      end
     end
   end
-end
-
 
-# obsolete
-class TcpOutput < StreamOutput
-  Plugin.register_output('tcp', self)
+  # obsolete
+  class TcpOutput < StreamOutput
+    Plugin.register_output('tcp', self)
 
-  def initialize
-    super
-    $log.warn "'tcp' output is obsoleted and will be removed. Use 'forward' instead."
-    $log.warn "see 'forward' section in http://fluentd.org/doc/plugin.html for the high-availability configuration."
-  end
+    def initialize
+      super
+      $log.warn "'tcp' output is obsoleted and will be removed. Use 'forward' instead."
+      $log.warn "see 'forward' section in http://fluentd.org/doc/plugin.html for the high-availability configuration."
+    end
 
-  config_param :port, :integer, :default => DEFAULT_LISTEN_PORT
-  config_param :host, :string
+    config_param :port, :integer, :default => DEFAULT_LISTEN_PORT
+    config_param :host, :string
 
-  def configure(conf)
-    super
-  end
+    def configure(conf)
+      super
+    end
 
-  def connect
-    TCPSocket.new(@host, @port)
+    def connect
+      TCPSocket.new(@host, @port)
+    end
   end
-end
 
+  # obsolete
+  class UnixOutput < StreamOutput
+    Plugin.register_output('unix', self)
 
-# obsolete
-class UnixOutput < StreamOutput
-  Plugin.register_output('unix', self)
-
-  def initialize
-    super
-    $log.warn "'unix' output is obsoleted and will be removed."
-  end
+    def initialize
+      super
+      $log.warn "'unix' output is obsoleted and will be removed."
+    end
 
-  config_param :path, :string
+    config_param :path, :string
 
-  def configure(conf)
-    super
-  end
+    def configure(conf)
+      super
+    end
 
-  def connect
-    UNIXSocket.new(@path)
+    def connect
+      UNIXSocket.new(@path)
+    end
   end
 end
-
-
-end
-

data/lib/fluent/plugin/out_test.rb

@@ -16,63 +16,59 @@
 #    limitations under the License.
 #
 module Fluent
+  class TestOutput < Output
+    Plugin.register_output('test', self)
 
+    def initialize
+      @emit_streams = []
+      @name = nil
+    end
 
-class TestOutput < Output
-  Plugin.register_output('test', self)
-
-  def initialize
-    @emit_streams = []
-    @name = nil
-  end
-
-  attr_reader :emit_streams, :name
+    attr_reader :emit_streams, :name
 
-  def emits
-    all = []
-    @emit_streams.each {|tag,events|
-      events.each {|time,record|
-        all << [tag, time, record]
+    def emits
+      all = []
+      @emit_streams.each {|tag,events|
+        events.each {|time,record|
+          all << [tag, time, record]
+        }
       }
-    }
-    all
-  end
+      all
+    end
 
-  def events
-    all = []
-    @emit_streams.each {|tag,events|
-      all.concat events
-    }
-    all
-  end
+    def events
+      all = []
+      @emit_streams.each {|tag,events|
+        all.concat events
+      }
+      all
+    end
 
-  def records
-    all = []
-    @emit_streams.each {|tag,events|
-      events.each {|time,record|
-        all << record
+    def records
+      all = []
+      @emit_streams.each {|tag,events|
+        events.each {|time,record|
+          all << record
+        }
       }
-    }
-    all
-  end
+      all
+    end
 
-  def configure(conf)
-    if name = conf['name']
-      @name = name
+    def configure(conf)
+      if name = conf['name']
+        @name = name
+      end
     end
-  end
 
-  def start
-  end
+    def start
+    end
 
-  def shutdown
-  end
+    def shutdown
+    end
 
-  def emit(tag, es, chain)
-    chain.next
-    @emit_streams << [tag, es.to_a]
+    def emit(tag, es, chain)
+      chain.next
+      @emit_streams << [tag, es.to_a]
+    end
   end
 end
-
-
-end