fluentd 0.10.18 → 0.10.19

data/ChangeLog

@@ -1,4 +1,11 @@
 
+Release 0.10.19 - 2012/04/13
+
+* Fixed in_syslog
+* in_tail: fixed "invalid byte sequence in US-ASCII" error
+* in_unix is not obsoleted
+
+
 Release 0.10.18 - 2012/04/13
 
 * Use Yajl instead of standard json library to avoid encoding problem

data/VERSION

@@ -1 +1 @@
-0.10.18
+0.10.19

data/lib/fluent/plugin/in_stream.rb

@@ -175,7 +175,6 @@ class TcpInput < ForwardInput
 end
 
 
-# obsolete
 class UnixInput < StreamInput
   Plugin.register_input('unix', self)
 
@@ -183,7 +182,7 @@ class UnixInput < StreamInput
 
   def configure(conf)
     super
-    $log.warn "'unix' input is obsoleted and will be removed. Use 'forward' instead."
+    #$log.warn "'unix' input is obsoleted and will be removed. Use 'forward' instead."
   end
 
   def listen

data/lib/fluent/plugin/in_syslog.rb

@@ -89,9 +89,34 @@ class SyslogInput < Input
     else
       callback = method(:receive_data)
     end
-    EventMachine.open_datagram_socket(@bind, @port, UdpHandler, callback)
+
+    @loop = Coolio::Loop.new
+
+    $log.debug "listening syslog socket on #{@bind}:#{@port}"
+    @usock = UDPSocket.new
+    @usock.bind(@bind, @port)
+
+    @handler = UdpHandler.new(@usock, callback)
+    @loop.attach(@handler)
+
+    @thread = Thread.new(&method(:run))
+  end
+
+  def shutdown
+    @loop.watchers.each {|w| w.detach }
+    @loop.stop
+    @handler.close
+    @thread.join
+  end
+
+  def run
+    @loop.run
+  rescue
+    $log.error "unexpected error", :error=>$!.to_s
+    $log.error_backtrace
   end
 
+  protected
   def receive_data_parser(data)
     m = SYSLOG_REGEXP.match(data)
     unless m
@@ -156,16 +181,21 @@ class SyslogInput < Input
     Engine.emit(tag, time, record)
   end
 
-  class UdpHandler < EventMachine::Connection
-    def initialize(callback)
-      super()
+  class UdpHandler < Coolio::IO
+    def initialize(io, callback)
+      super(io)
+      @io = io
       @callback = callback
     end
 
-    def receive_data(data)
-      EventMachine.defer {
-        @callback.call(data)
-      }
+    def on_readable
+      msg, addr = @io.recvfrom_nonblock(1024)
+      #host = addr[3]
+      #port = addr[1]
+      #@callback.call(host, port, msg)
+      @callback.call(msg)
+    rescue
+      # TODO log?
     end
   end
 end

data/lib/fluent/plugin/in_tail.rb

@@ -261,8 +261,8 @@ class TailInput < Input
         @io = io
         @pe = pe
         @receive_lines = receive_lines
-        @buffer = ''
-        @iobuf = ''
+        @buffer = ''.force_encoding('ASCII-8BIT')
+        @iobuf = ''.force_encoding('ASCII-8BIT')
       end
 
       attr_reader :io

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-VERSION = '0.10.18'
+VERSION = '0.10.19'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.18
+  version: 0.10.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
+date: 2012-04-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70290194123200 !ruby/object:Gem::Requirement
+  requirement: &70342941850580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70290194123200
+  version_requirements: *70342941850580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70290194122380 !ruby/object:Gem::Requirement
+  requirement: &70342941849920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70290194122380
+  version_requirements: *70342941849920
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70290194121680 !ruby/object:Gem::Requirement
+  requirement: &70342941849140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290194121680
+  version_requirements: *70342941849140
 - !ruby/object:Gem::Dependency
   name: cool.io
-  requirement: &70290194120960 !ruby/object:Gem::Requirement
+  requirement: &70342941848200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70290194120960
+  version_requirements: *70342941848200
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &70290194120180 !ruby/object:Gem::Requirement
+  requirement: &70342941847500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70290194120180
+  version_requirements: *70342941847500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70290194119440 !ruby/object:Gem::Requirement
+  requirement: &70342941846860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70290194119440
+  version_requirements: *70342941846860
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70290194118780 !ruby/object:Gem::Requirement
+  requirement: &70342941846100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70290194118780
+  version_requirements: *70342941846100
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70290194117960 !ruby/object:Gem::Requirement
+  requirement: &70342941845440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *70290194117960
+  version_requirements: *70342941845440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70290194117240 !ruby/object:Gem::Requirement
+  requirement: &70342941844840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70290194117240
+  version_requirements: *70342941844840
 description: 
 email: frsyuki@gmail.com
 executables: