fluentd 0.10.25 → 0.10.26

data/ChangeLog

@@ -1,4 +1,25 @@
 
+Release 0.10.26 - 2012/09/26
+
+* added in_debug_agent plugin and fluent-debug command which enable you to
+  gather internal information of running Fluentd process using interactive shell
+* supervisor: --user commandline argument also inherits secondary groups (id -G)
+* out_forward: supports 'expire_dns_cache' option to set DNS expire time or disable
+  caching. Default behavior is 'never expire' which is same as former versions
+* out_forward: assumes successful data transfer via TCP as a successful
+  heartbeat.
+* out_forward: lazier failure detection: default phi_threshold 8 -> 10
+* in_forward: uses other nodes aggressively if it couldn't send data to the first
+  candidate to not stall during the wait time before detecting failure
+* in_forward: fixed shutdown procedure
+* in_tail: seeks to the saved position if detected log rotation actually
+  didn't rotate the file (meaning inode doesn't change). this change enables
+  cronolog to work with Fluentd.
+* in_tail: fixed a problem that it couldn't recover from uncaught exceptions
+  caused by output plugins
+* fluentd command supports '-q' option to decrease log level
+
+
 Release 0.10.25 - 2012/07/23
 
 * shutdown won't block

data/Rakefile

@@ -24,7 +24,7 @@ begin
     gemspec.test_files = Dir["test/**/*.rb"]
     gemspec.files = Dir["bin/**/*", "lib/**/*", "test/**/*.rb"] +
       %w[fluent.conf VERSION AUTHORS Rakefile COPYING fluentd.gemspec Gemfile]
-    gemspec.executables = ['fluentd', 'fluent-cat', 'fluent-gem']
+    gemspec.executables = ['fluentd', 'fluent-cat', 'fluent-gem', 'fluent-debug']
     gemspec.required_ruby_version = '~> 1.9.2'
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.25
+0.10.26

data/bin/fluent-debug

@@ -0,0 +1,6 @@
+#!/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/fluent.conf

@@ -26,6 +26,12 @@
 #  tag apache.access
 #</source>
 
+# Listen DRb for debug
+<source>
+  type debug_agent
+  port 24230
+</source>
+
 
 ## match tag=apache.access and write to file
 #<match apache.access>

data/lib/fluent/command/debug.rb

@@ -0,0 +1,82 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'optparse'
+
+op = OptionParser.new
+
+host = '127.0.0.1'
+port = 24230
+unix = nil
+
+op.on('-h', '--host HOST', "fluent host (default: #{host})") {|s|
+  host = s
+}
+
+op.on('-p', '--port PORT', "debug_agent tcp port (default: #{port})", Integer) {|i|
+  port = i
+}
+
+op.on('-u', '--unix PATH', "use unix socket instead of tcp") {|b|
+  unix = b
+}
+
+begin
+  op.parse!(ARGV)
+
+  if ARGV.length != 0
+    usage nil
+  end
+rescue
+  usage $!.to_s
+end
+
+require 'drb/drb'
+
+if unix
+  uri = "drbunix:#{unix}"
+else
+  uri = "druby://#{host}:#{port}"
+end
+
+require 'fluent/load'
+
+$log = Fluent::Log.new(STDERR, Fluent::Log::LEVEL_TRACE)
+Fluent::Engine.init
+
+remote_engine = DRb::DRbObject.new_with_uri(uri)
+
+Fluent.module_eval do
+  remove_const(:Engine)
+  const_set(:Engine, remote_engine)
+end
+
+include Fluent
+
+puts "Connected to #{uri}."
+puts "Usage:"
+puts "    Engine.match('some.tag').output  : get an output plugin instance"
+puts "    Engine.sources[i]                : get input plugin instances"
+puts "    Plugin.load_plugin(type,name)    : load plugin class (use this if you get DRb::DRbUnknown)"
+puts ""
+
+Encoding.default_internal = nil if Encoding.respond_to?(:default_internal)
+
+require 'irb'
+IRB.start
+

data/lib/fluent/command/fluentd.rb

@@ -78,14 +78,15 @@ op.on('-i', '--inline-config CONFIG_STRING', "inline config which is appended to
 }
 
 
-op.on('-v', '--verbose', "increment verbose level (-v: debug, -vv: trace)", TrueClass) {|b|
+op.on('-v', '--verbose', "increase verbose level (-v: debug, -vv: trace)", TrueClass) {|b|
   if b
-    case opts[:log_level]
-    when Fluent::Log::LEVEL_INFO
-      opts[:log_level] = Fluent::Log::LEVEL_DEBUG
-    when Fluent::Log::LEVEL_DEBUG
-      opts[:log_level] = Fluent::Log::LEVEL_TRACE
-    end
+    opts[:log_level] = [opts[:log_level] - 1, Fluent::Log::LEVEL_TRACE].max
+  end
+}
+
+op.on('-q', '--quiet', "decrease verbose level (-q: warn, -qq: error)", TrueClass) {|b|
+  if b
+    opts[:log_level] = [opts[:log_level] + 1, Fluent::Log::LEVEL_ERROR].min
   end
 }
 

data/lib/fluent/engine.rb

@@ -27,6 +27,8 @@ class EngineClass
     @default_loop = nil
   end
 
+  attr_reader :matches, :sources
+
   def init
     BasicSocket.do_not_reverse_lookup = true
     Plugin.load_plugins

data/lib/fluent/plugin.rb

@@ -65,6 +65,10 @@ class PluginClass
     nil
   end
 
+  def load_plugin(type, name)
+    try_load_plugin(name, type)
+  end
+
   private
   def load_gem_plugins
     return unless defined? Gem

data/lib/fluent/plugin/in_debug_agent.rb

@@ -0,0 +1,57 @@
+#
+# Fluent
+#
+# Copyright (C) 2011 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+module Fluent
+
+
+class DebugAgentInput < Input
+  Plugin.register_input('debug_agent', self)
+
+  def initialize
+    require 'drb/drb'
+    super
+  end
+
+  config_param :bind, :string, :default => '0.0.0.0'
+  config_param :port, :integer, :default => 24230
+  config_param :unix_path, :integer, :default => nil
+  #config_param :unix_mode  # TODO
+  config_param :object, :string, :default => 'Engine'
+
+  def configure(conf)
+    super
+  end
+
+  def start
+    if @unix_path
+      require 'drb/unix'
+      uri = "drbunix:#{@unix_path}"
+    else
+      uri = "druby://#{@bind}:#{@port}"
+    end
+    $log.info "listening dRuby", :uri => uri, :object => @object
+    obj = eval(@object)
+    @server = DRb::DRbServer.new(uri, obj)
+  end
+
+  def shutdown
+    @server.stop_service if @server
+  end
+end
+
+
+end

data/lib/fluent/plugin/in_forward.rb

@@ -51,7 +51,8 @@ class ForwardInput < Input
     @loop.watchers.each {|w| w.detach }
     @loop.stop
     @usock.close
-    TCPSocket.open('127.0.0.1', @port) {|sock| }  # FIXME @thread.join blocks without this line
+    listen_address = (@bind == '0.0.0.0' ? '127.0.0.1' : @bind)
+    TCPSocket.open(listen_address, @port) {|sock| }  # FIXME @thread.join blocks without this line
     @thread.join
     @lsock.close
   end
@@ -200,7 +201,7 @@ class ForwardInput < Input
 
   def on_heartbeat_request(host, port, msg)
     #$log.trace "heartbeat request from #{host}:#{port}"
-    @usock.send "", 0, host, port
+    @usock.send "\0", 0, host, port
   end
 end
 

data/lib/fluent/plugin/in_object_space.rb

@@ -92,7 +92,7 @@ class ObjectSpaceInput < Input
     map = {}
 
     ObjectSpace.each_object {|obj|
-      klass = obj.class
+      klass = obj.class rescue Object
       if c = map[klass]
         c.incr!
       else

data/lib/fluent/plugin/in_syslog.rb

@@ -22,7 +22,7 @@ class SyslogInput < Input
   Plugin.register_input('syslog', self)
 
   SYSLOG_REGEXP = /^\<([0-9]+)\>(.*)/
-  SYSLOG_ALL_REGEXP = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* [^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
+  SYSLOG_ALL_REGEXP = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?[^\:]*\: *(?<message>.*)$/
   TIME_FORMAT = "%b %d %H:%M:%S"
 
   FACILITY_MAP = {
@@ -155,7 +155,7 @@ class SyslogInput < Input
         when "pri"
           pri = value.to_i
         when "time"
-          time = Time.strptime(value, TIME_FORMAT).to_i
+          time = Time.strptime(value.gsub(/ +/, ' '), TIME_FORMAT).to_i
         else
           record[name] = value
         end
@@ -189,7 +189,7 @@ class SyslogInput < Input
     end
 
     def on_readable
-      msg, addr = @io.recvfrom_nonblock(1024)
+      msg, addr = @io.recvfrom_nonblock(2048)
       #host = addr[3]
       #port = addr[1]
       #@callback.call(host, port, msg)

data/lib/fluent/plugin/in_tail.rb

@@ -61,7 +61,7 @@ class TailInput < Input
   def start
     @loop = Coolio::Loop.new
     @tails = @paths.map {|path|
-      pe = @pf ? @pf[path] : NullPositionEntry.instance
+      pe = @pf ? @pf[path] : MemoryPositionEntry.new
       TailWatcher.new(path, @rotate_wait, pe, &method(:receive_lines))
     }
     @tails.each {|tail|
@@ -102,7 +102,11 @@ class TailInput < Input
     }
 
     unless es.empty?
-      Engine.emit_stream(@tag, es)
+      begin
+        Engine.emit_stream(@tag, es)
+      rescue
+        # ignore errors. Engine shows logs and backtraces.
+      end
     end
   end
 
@@ -114,7 +118,7 @@ class TailInput < Input
     def initialize(path, rotate_wait, pe, &receive_lines)
       @path = path
       @rotate_wait = rotate_wait
-      @pe = pe || NullPositionEntry.instance
+      @pe = pe || MemoryPositionEntry.new
       @receive_lines = receive_lines
 
       @rotate_queue = []
@@ -156,6 +160,19 @@ class TailInput < Input
 
       while @rotate_queue.first.ready?
         if io = @rotate_queue.first.io
+          stat = io.stat
+          inode = stat.ino
+          if inode == @pe.read_inode
+            # rotated file has the same inode number with the last file.
+            # assuming following situation:
+            #   a) file was once renamed and backed, or
+            #   b) symlink or hardlink to the same file is recreated
+            # in either case, seek to the saved position
+            pos = @pe.read_pos
+          else
+            pos = io.pos
+          end
+          @pe.update(inode, pos)
           io_handler = IOHandler.new(io, @pe, &@receive_lines)
         else
           io_handler = NullIOHandler.new
@@ -386,7 +403,7 @@ class TailInput < Input
       @file.write "0000000000000000\t00000000\n"
       @last_pos = @file.pos
 
-      @map[path] = PositionEntry.new(@file, seek)
+      @map[path] = FilePositionEntry.new(@file, seek)
     end
 
     def self.parse(file)
@@ -399,7 +416,7 @@ class TailInput < Input
         pos = m[2].to_i(16)
         ino = m[3].to_i(16)
         seek = file.pos - line.bytesize + path.bytesize + 1
-        map[path] = PositionEntry.new(file, seek)
+        map[path] = FilePositionEntry.new(file, seek)
       }
       new(file, map, file.pos)
     end
@@ -407,7 +424,7 @@ class TailInput < Input
 
   # pos               inode
   # ffffffffffffffff\tffffffff\n
-  class PositionEntry
+  class FilePositionEntry
     POS_SIZE = 16
     INO_OFFSET = 17
     INO_SIZE = 8
@@ -441,18 +458,27 @@ class TailInput < Input
     end
   end
 
-  class NullPositionEntry
-    require 'singleton'
-    include Singleton
+  class MemoryPositionEntry
+    def initialize
+      @pos = 0
+      @inode = 0
+    end
+
     def update(ino, pos)
+      @inode = ino
+      @pos = pos
     end
+
     def update_pos(pos)
+      @pos = pos
     end
+
     def read_pos
-      0
+      @pos
     end
+
     def read_inode
-      0
+      @inode
     end
   end
 end

data/lib/fluent/plugin/out_forward.rb

@@ -25,14 +25,15 @@ class ForwardOutput < ObjectBufferedOutput
     super
     require 'socket'
     require 'fileutils'
-    @nodes = {}  #=> {sockaddr => Node}
+    @nodes = []  #=> [Node]
   end
 
   config_param :send_timeout, :time, :default => 60
   config_param :heartbeat_interval, :time, :default => 1
   config_param :recover_wait, :time, :default => 10
   config_param :hard_timeout, :time, :default => 60
-  config_param :phi_threshold, :integer, :default => 8
+  config_param :expire_dns_cache, :time, :default => nil  # 0 means disable cache
+  config_param :phi_threshold, :integer, :default => 16
   attr_reader :nodes
 
   # backward compatibility
@@ -72,10 +73,8 @@ class ForwardOutput < ObjectBufferedOutput
       end
 
       failure = FailureDetector.new(@heartbeat_interval, @hard_timeout, Time.now.to_i.to_f)
-      sockaddr = Socket.pack_sockaddr_in(port, host)
-      port, host = Socket.unpack_sockaddr_in(sockaddr)
-      @nodes[sockaddr] = Node.new(name, host, port, weight, standby, failure,
-                                  @phi_threshold, recover_sample_size)
+      @nodes << Node.new(name, host, port, weight, standby, failure,
+                         @phi_threshold, recover_sample_size, @expire_dns_cache)
       $log.info "adding forwarding server '#{name}'", :host=>host, :port=>port, :weight=>weight
     }
   end
@@ -123,23 +122,34 @@ class ForwardOutput < ObjectBufferedOutput
   end
 
   def write_objects(tag, es)
+    error = nil
+
     wlen = @weight_array.length
     wlen.times do
       node = @weight_array[@rr]
       @rr = (@rr + 1) % wlen
 
       if node.available?
-        send_data(node, tag, es)
-        return
+        begin
+          send_data(node, tag, es)
+          return
+        rescue
+          # for load balancing during detecting crashed servers
+          error = $!  # use the latest error
+        end
       end
     end
 
-    raise "no nodes are available"  # TODO message
+    if error
+      raise error
+    else
+      raise "no nodes are available"  # TODO message
+    end
   end
 
   private
   def rebuild_weight_array
-    standby_nodes, regular_nodes = @nodes.values.partition {|n|
+    standby_nodes, regular_nodes = @nodes.partition {|n|
       n.standby?
     }
 
@@ -170,6 +180,10 @@ class ForwardOutput < ObjectBufferedOutput
       }
     }
 
+    # for load balancing during detecting crashed servers
+    coe = (regular_nodes.size * 6) / weight_array.size
+    weight_array *= coe if coe > 1
+
     r = Random.new(@rand_seed)
     weight_array.sort_by! { r.rand }
 
@@ -209,6 +223,8 @@ class ForwardOutput < ObjectBufferedOutput
 
       # writeRawBody(packed_es)
       es.write_to(sock)
+
+      node.heartbeat(false)
     ensure
       sock.close
     end
@@ -216,7 +232,7 @@ class ForwardOutput < ObjectBufferedOutput
 
   def connect(node)
     # TODO unix socket?
-    TCPSocket.new(node.host, node.port)
+    TCPSocket.new(node.resolved_host, node.port)
   end
 
   class HeartbeatRequestTimer < Coolio::TimerWatcher
@@ -234,16 +250,16 @@ class ForwardOutput < ObjectBufferedOutput
 
   def on_timer
     return if @finished
-    @nodes.each_pair {|sockaddr,n|
+    @nodes.each {|n|
       if n.tick
         rebuild_weight_array
       end
       begin
         #$log.trace "sending heartbeat #{n.host}:#{n.port}"
-        @usock.send "", 0, sockaddr
+        @usock.send "\0", 0, Socket.pack_sockaddr_in(n.port, n.resolved_host)
       rescue
         # TODO log
-        $log.debug "failed to send heartbeat packet to #{Socket.unpack_sockaddr_in(sockaddr).reverse.join(':')}", :error=>$!.to_s
+        $log.debug "failed to send heartbeat packet to #{n.host}:#{n.port}", :error=>$!.to_s
       end
     }
   end
@@ -267,7 +283,8 @@ class ForwardOutput < ObjectBufferedOutput
   end
 
   def on_heartbeat(sockaddr, msg)
-    if node = @nodes[sockaddr]
+    port, host = Socket.unpack_sockaddr_in(sockaddr)
+    if node = @nodes.find {|n| n.sockaddr == sockaddr }
       #$log.trace "heartbeat from '#{node.name}'", :host=>node.host, :port=>node.port
       if node.heartbeat
         rebuild_weight_array
@@ -277,7 +294,7 @@ class ForwardOutput < ObjectBufferedOutput
 
   class Node
     def initialize(name, host, port, weight, standby, failure,
-                   phi_threshold, recover_sample_size)
+                   phi_threshold, recover_sample_size, expire_dns_cache)
       @name = name
       @host = host
       @port = port
@@ -286,11 +303,17 @@ class ForwardOutput < ObjectBufferedOutput
       @failure = failure
       @phi_threshold = phi_threshold
       @recover_sample_size = recover_sample_size
+      @expire_dns_cache = expire_dns_cache
       @available = true
+
+      @resolved_host = nil
+      @resolved_time = 0
+      resolved_host  # check dns
     end
 
     attr_reader :name, :host, :port, :weight
     attr_writer :weight, :standby, :available
+    attr_reader :sockaddr  # used by on_heartbeat
 
     def available?
       @available
@@ -300,6 +323,34 @@ class ForwardOutput < ObjectBufferedOutput
       @standby
     end
 
+    def resolved_host
+      case @expire_dns_cache
+      when 0
+        # cache is disabled
+        return resolve_dns!
+
+      when nil
+        # persistent cache
+        return @resolved_host ||= resolve_dns!
+
+      else
+        now = Engine.now
+        rh = @resolved_host
+        if !rh || now - @resolved_time >= @expire_dns_cache
+          rh = @resolved_host = resolve_dns!
+          @resolved_time = now
+        end
+        return rh
+      end
+    end
+
+    def resolve_dns!
+      @sockaddr = Socket.pack_sockaddr_in(@port, @host)
+      port, resolved_host = Socket.unpack_sockaddr_in(sockaddr)
+      return resolved_host
+    end
+    private :resolve_dns!
+
     def tick
       now = Time.now.to_f
       if !@available
@@ -312,6 +363,7 @@ class ForwardOutput < ObjectBufferedOutput
       if @failure.hard_timeout?(now)
         $log.info "detached forwarding server '#{@name}'", :host=>@host, :port=>@port, :hard_timeout=>true
         @available = false
+        @resolved_host = nil  # expire cached host
         @failure.clear
         return true
       end
@@ -321,6 +373,7 @@ class ForwardOutput < ObjectBufferedOutput
       if phi > @phi_threshold
         $log.info "detached forwarding server '#{@name}'", :host=>@host, :port=>@port, :phi=>phi
         @available = false
+        @resolved_host = nil  # expire cached host
         @failure.clear
         return true
       else
@@ -328,13 +381,13 @@ class ForwardOutput < ObjectBufferedOutput
       end
     end
 
-    def heartbeat
+    def heartbeat(detect=true)
       now = Time.now.to_f
       @failure.add(now)
       #$log.trace "heartbeat from '#{@name}'", :host=>@host, :port=>@port, :available=>@available, :sample_size=>@failure.sample_size
-      if !@available && @failure.sample_size > @recover_sample_size
-        $log.info "recovered forwarding server '#{@name}'", :host=>@host, :port=>@port
+      if detect && !@available && @failure.sample_size > @recover_sample_size
         @available = true
+        $log.info "recovered forwarding server '#{@name}'", :host=>@host, :port=>@port
         return true
       else
         return nil

data/lib/fluent/supervisor.rb

@@ -267,6 +267,13 @@ class Supervisor
           exit 1
         end
       end
+
+      user_groups = `id -G #{@chuser}`.split.map(&:to_i)
+      if $?.to_i != 0
+        exit 1
+      end
+
+      Process.groups = Process.groups | user_groups
       Process::UID.change_privilege(chuid)
     end
   end

data/lib/fluent/test/base.rb

@@ -39,7 +39,7 @@ class TestDriver
 
   def configure(str)
     if str.is_a?(Config)
-      @config = @str
+      @config = str
     else
       @config = Config.parse(str, "(test)")
     end

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.25'
+VERSION = '0.10.26'
 
 end

data/test/mixin.rb

@@ -18,6 +18,7 @@ module MixinTest
     def teardown
       super
       Timecop.return
+      GC.start
     end
 
     module Checker
@@ -51,7 +52,7 @@ module MixinTest
       }
 
       Fluent::Test::BufferedOutputTestDriver.new(klass) {
-      }.configure("tyep #{register_output_name}" + conf)
+      }.configure("type #{register_output_name}" + conf)
     end
   end
 

data/test/plugin/in_object_space.rb

@@ -1,6 +1,12 @@
 require 'fluent/test'
 
 class ObjectSpaceInputTest < Test::Unit::TestCase
+  class FailObject
+    def self.class
+      raise "error"
+    end
+  end
+
   def setup
     Fluent::Test.setup
   end

data/test/plugin/in_syslog.rb

@@ -0,0 +1,70 @@
+require 'fluent/test'
+
+class SyslogInputTest < Test::Unit::TestCase
+  def setup
+    Fluent::Test.setup
+  end
+
+  CONFIG = %[
+    port 9911
+    bind 127.0.0.1
+    tag syslog
+  ]
+
+  def create_driver(conf=CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::SyslogInput).configure(conf)
+  end
+
+  def test_configure
+    d = create_driver
+    assert_equal 9911, d.instance.port
+    assert_equal '127.0.0.1', d.instance.bind
+  end
+
+  def test_time_format
+    d = create_driver
+
+    tests = [
+      {'msg' => '<6>Sep 11 00:00:00 localhost logger: foo', 'expected' => Time.strptime('Sep 11 00:00:00', '%b %d %H:%M:%S').to_i},
+      {'msg' => '<6>Sep  1 00:00:00 localhost logger: foo', 'expected' => Time.strptime('Sep  1 00:00:00', '%b  %d %H:%M:%S').to_i},
+    ]
+
+    d.run do
+      u = UDPSocket.new
+      u.connect('127.0.0.1', 9911)
+      tests.each {|test|
+        u.send(test['msg'], 0)
+      }
+      sleep 1
+    end
+
+    emits = d.emits
+    emits.each_index {|i|
+      assert_equal(tests[i]['expected'], emits[i][1])
+    }
+  end
+
+  def test_msg_size
+    d = create_driver
+
+    tests = [
+      {'msg' => '<6>Sep 10 00:00:00 localhost logger: ' + 'x' * 100, 'expected' => 'x' * 100},
+      {'msg' => '<6>Sep 10 00:00:00 localhost logger: ' + 'x' * 1024, 'expected' => 'x' * 1024},
+    ]
+
+    d.run do
+      u = UDPSocket.new
+      u.connect('127.0.0.1', 9911)
+      tests.each {|test|
+        u.send(test['msg'], 0)
+      }
+      sleep 1
+    end
+
+    emits = d.emits
+    emits.each_index {|i|
+      assert_equal(tests[i]['expected'], emits[i][2]['message'])
+    }
+  end
+end
+

data/test/plugin/out_forward.rb

@@ -27,7 +27,7 @@ class ForwardOutputTest < Test::Unit::TestCase
     nodes = d.instance.nodes
     assert_equal 51, d.instance.send_timeout
     assert_equal 1, nodes.length
-    node = nodes.values.first
+    node = nodes.first
     assert_equal "test", node.name
     assert_equal '127.0.0.1', node.host
     assert_equal 13999, node.port

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.25
+  version: 0.10.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -161,6 +161,7 @@ executables:
 - fluentd
 - fluent-cat
 - fluent-gem
+- fluent-debug
 extensions: []
 extra_rdoc_files:
 - ChangeLog
@@ -172,12 +173,14 @@ files:
 - Rakefile
 - VERSION
 - bin/fluent-cat
+- bin/fluent-debug
 - bin/fluent-gem
 - bin/fluentd
 - fluent.conf
 - fluentd.gemspec
 - lib/fluent/buffer.rb
 - lib/fluent/command/cat.rb
+- lib/fluent/command/debug.rb
 - lib/fluent/command/fluentd.rb
 - lib/fluent/config.rb
 - lib/fluent/engine.rb
@@ -196,6 +199,7 @@ files:
 - lib/fluent/plugin/buf_file.rb
 - lib/fluent/plugin/buf_memory.rb
 - lib/fluent/plugin/buf_zfile.rb
+- lib/fluent/plugin/in_debug_agent.rb
 - lib/fluent/plugin/in_exec.rb
 - lib/fluent/plugin/in_forward.rb
 - lib/fluent/plugin/in_gc_stat.rb
@@ -232,6 +236,7 @@ files:
 - test/plugin/in_http.rb
 - test/plugin/in_object_space.rb
 - test/plugin/in_stream.rb
+- test/plugin/in_syslog.rb
 - test/plugin/in_tail.rb
 - test/plugin/out_copy.rb
 - test/plugin/out_exec.rb
@@ -278,6 +283,7 @@ test_files:
 - test/plugin/in_http.rb
 - test/plugin/in_object_space.rb
 - test/plugin/in_stream.rb
+- test/plugin/in_syslog.rb
 - test/plugin/in_tail.rb
 - test/plugin/out_copy.rb
 - test/plugin/out_exec.rb