fluentd 0.10.39 → 0.10.40

data/ChangeLog

@@ -1,3 +1,13 @@
+Release 0.10.40 - 2013/11/08
+
+* Dump gem version of fluent-plugin-xxx and fluent-mixin-xxx
+* in_http: Doesn't set REMOTE_ADDR when IO#getpeername failed
+* in_tail/parser: Fix RegexpParser which ignores time_format parameter
+* in_exec: Catch error and dumps error message in run_periodic
+* in_forward: Show error class in the error message
+* in_exec/out_exec_filter: Catch more exceptions, not only Errno::ESRCH, at shutdown
+* Log: Catch exception for log event handling at shutdown
+
 Release 0.10.39 - 2013/09/18
 
 * out_file: Improve symlink handling with buf_file

data/lib/fluent/engine.rb

@@ -80,6 +80,11 @@ module Fluent
     end
 
     def configure(conf)
+      # plugins / configuration dumps
+      Gem::Specification.find_all.select{|x| x.name =~ /^fluent(d|-(plugin|mixin)-.*)$/}.each do |spec|
+        $log.info "gem '#{spec.name}' version '#{spec.version}'"
+      end
+
       unless @suppress_config_dump
         $log.info "using configuration file: #{conf.to_s.rstrip}"
       end

data/lib/fluent/log.rb

@@ -104,6 +104,8 @@ module Fluent
       args << block.call if block
       time, msg = event(:trace, args)
       puts [@color_trace, caller_line(time, 1, LEVEL_TRACE), msg, @color_reset].join
+    rescue
+      # logger should not raise an exception. This rescue prevents unexpected behaviour.
     end
     alias TRACE trace
 
@@ -126,6 +128,7 @@ module Fluent
       args << block.call if block
       time, msg = event(:debug, args)
       puts [@color_debug, caller_line(time, 1, LEVEL_DEBUG), msg, @color_reset].join
+    rescue
     end
     alias DEBUG debug
 
@@ -148,6 +151,7 @@ module Fluent
       args << block.call if block
       time, msg = event(:info, args)
       puts [@color_info, caller_line(time, 1, LEVEL_INFO), msg, @color_reset].join
+    rescue
     end
     alias INFO info
 
@@ -170,6 +174,7 @@ module Fluent
       args << block.call if block
       time, msg = event(:warn, args)
       puts [@color_warn, caller_line(time, 1, LEVEL_WARN), msg, @color_reset].join
+    rescue
     end
     alias WARN warn
 
@@ -192,6 +197,7 @@ module Fluent
       args << block.call if block
       time, msg = event(:error, args)
       puts [@color_error, caller_line(time, 1, LEVEL_ERROR), msg, @color_reset].join
+    rescue
     end
     alias ERROR error
 
@@ -214,6 +220,7 @@ module Fluent
       args << block.call if block
       time, msg = event(:fatal, args)
       puts [@color_fatal, caller_line(time, 1, LEVEL_FATAL), msg, @color_reset].join
+    rescue
     end
     alias FATAL fatal
 

data/lib/fluent/parser.rb

@@ -327,7 +327,7 @@ module Fluent
           raise ConfigError, "Invalid regexp '#{format[1..-2]}': #{$!}"
         end
 
-        @parser = RegexpParser.new(regexp)
+        @parser = RegexpParser.new(regexp, conf)
 
       else
         # built-in template

data/lib/fluent/plugin/in_exec.rb

@@ -96,11 +96,18 @@ module Fluent
         @finished = true
         @thread.join
       else
-        Process.kill(:TERM, @pid)
+        begin
+          Process.kill(:TERM, @pid)
+        rescue #Errno::ECHILD, Errno::ESRCH, Errno::EPERM
+        end
         if @thread.join(60)  # TODO wait time
           return
         end
-        Process.kill(:KILL, @pid)
+
+        begin
+          Process.kill(:KILL, @pid)
+        rescue #Errno::ECHILD, Errno::ESRCH, Errno::EPERM
+        end
         @thread.join
       end
     end
@@ -111,10 +118,15 @@ module Fluent
 
     def run_periodic
       until @finished
-        sleep @run_interval
-        io = IO.popen(@command, "r")
-        @parser.call(io)
-        Process.waitpid(io.pid)
+        begin
+          sleep @run_interval
+          io = IO.popen(@command, "r")
+          @parser.call(io)
+          Process.waitpid(io.pid)
+        rescue
+          $log.error "exec failed to run or shutdown child process", :error => $!.to_s, :error_class => $!.class.to_s
+          $log.warn_backtrace $!.backtrace
+        end
       end
     end
 

data/lib/fluent/plugin/in_forward.rb

@@ -79,8 +79,8 @@ module Fluent
 
     def run
       @loop.run
-    rescue
-      $log.error "unexpected error", :error=>$!.to_s
+    rescue => e
+      $log.error "unexpected error", :error => e, :error_class => e.class
       $log.error_backtrace
     end
 
@@ -175,16 +175,16 @@ module Fluent
 
       def on_read_json(data)
         @y << data
-      rescue
-        $log.error "forward error: #{$!.to_s}"
+      rescue => e
+        $log.error "forward error", :error => e, :error_class => e.class
         $log.error_backtrace
         close
       end
 
       def on_read_msgpack(data)
         @u.feed_each(data, &@on_message)
-      rescue
-        $log.error "forward error: #{$!.to_s}"
+      rescue => e
+        $log.error "forward error", :error => e, :error_class => e.class
         $log.error_backtrace
         close
       end

data/lib/fluent/plugin/in_http.rb

@@ -154,7 +154,7 @@ module Fluent
         @idle = 0
         @km.add(self)
 
-        @remote_port, @remote_addr = *Socket.unpack_sockaddr_in(io.getpeername)
+        @remote_port, @remote_addr = *Socket.unpack_sockaddr_in(io.getpeername) rescue nil
       end
 
       def step_idle
@@ -234,7 +234,7 @@ module Fluent
       def on_message_complete
         return if closing?
 
-        @env['REMOTE_ADDR'] = @remote_addr
+        @env['REMOTE_ADDR'] = @remote_addr if @remote_addr
 
         params = WEBrick::HTTPUtils.parse_query(@parser.query_string)
 

data/lib/fluent/plugin/in_tail.rb

@@ -358,7 +358,6 @@ module Fluent
           @inode = nil
           @fsize = -1  # first
           @on_rotate = on_rotate
-          @path = path
         end
 
         def on_notify

data/lib/fluent/plugin/out_exec_filter.rb

@@ -261,7 +261,7 @@ module Fluent
       def kill_child(join_wait)
         begin
           Process.kill(:TERM, @pid)
-        rescue Errno::ESRCH
+        rescue #Errno::ECHILD, Errno::ESRCH, Errno::EPERM
           # Errno::ESRCH 'No such process', ignore
           # child process killed by signal chained from fluentd process
         end
@@ -271,7 +271,7 @@ module Fluent
         end
         begin
           Process.kill(:KILL, @pid)
-        rescue Errno::ESRCH
+        rescue #Errno::ECHILD, Errno::ESRCH, Errno::EPERM
           # ignore if successfully killed by :TERM
         end
         @thread.join

data/lib/fluent/version.rb

@@ -1,5 +1,5 @@
 module Fluent
 
-  VERSION = '0.10.39'
+  VERSION = '0.10.40'
 
 end

metadata

@@ -1,32 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.10.39
+  version: 0.10.40
+  prerelease: 
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-18 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -35,20 +37,21 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.4
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.0
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.1
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.2
-    - - '!='
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 0.5.3
     - - <
@@ -57,20 +60,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,6 +84,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -85,6 +92,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -92,6 +100,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,6 +108,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -106,6 +116,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -113,57 +124,65 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.15.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.15.3
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Fluentd is an event collector system. It is a generalized version of
@@ -270,26 +289,30 @@ files:
 - test/scripts/exec_script.rb
 homepage: http://fluentd.org/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2484756068667475409
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Fluentd event collector
 test_files:
 - test/config.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 14f93577d21ab248d08466b142442d503ba9ad55
-  data.tar.gz: 9036d89bf55c57a454120dc766c3da6fe445fbf8
-SHA512:
-  metadata.gz: 5c4ae2365e4e3a59cc22e7089203ea57b3cf7bc89d759915e4f02b795312903116484dd65f43a7e07ed9e98a1da13f5e1aa6112a0448d03706e4171cd3dad63a
-  data.tar.gz: 806d690bccc9674f2bd45d693eb523a07e06d0aa4e2dc63e42396421d34ce8f27977bba119b0e5470d8844ee62c140cd1cf8c4bff1b8ce2aa16bd8d40e7fb419