fluentd 0.12.24 → 0.12.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6393d8dfc67b70656190c768de2acb86e8b453
-  data.tar.gz: 70f4e1abb3b9d3dda769e4e9ded10dff755602c8
+  metadata.gz: e3a1a70a3ede3a8713d613dba499b4224ae138d1
+  data.tar.gz: 4177832b3d06ba52df8032bd5457d7bffaaccf76
 SHA512:
-  metadata.gz: 222628da1465e330bed1f54024845fc9cebd54e80b2c457fb61c8ec46ac8f429a5bd92d43530fb7bc1b34376a00c363ad6b39dedcfd13520a554cafc6d7d7468
-  data.tar.gz: 00061a3007fd77070568dd0fb59460cf059fe13bdb9d1ce90823e89ce9f91a121a2adec4961d4978987c3198468229edc0bbd88fc0d0c3b68a67d02afc39d8d8
+  metadata.gz: 30e12945ba3a228f68ad2f8052eb4e0fab9bc6e9a21df25a7bd33c397d806c3d0ad6e04897f107935838544dd9d4fc32286b7cbeb9fb8f82b3f3e5a90c940a0e
+  data.tar.gz: 8e4f32b8e1ab4aa053b1b147d6b6eb19f20d9c7d0f427404b0201008034c0bb2057c1de52a33868276e9014dd592960ad0068b6470553d7ef756f93d6a589c14

data/ChangeLog

@@ -1,5 +1,17 @@
 # v0.12
 
+## Release 0.12.25 - 2016/05/25
+
+### New features / Enhancement
+
+* process: Add detach_process_forward_interval parameter to control emit interval
+  https://github.com/fluent/fluentd/pull/982
+
+### Bug fixes
+
+* Fix string-scrub dependency for ruby 2.0 or earlier support
+  https://github.com/fluent/fluentd/pull/986
+
 ## Release 0.12.24 - 2016/05/20
 
 ### New features / Enhancement

data/fluentd.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])
   gem.add_runtime_dependency("tzinfo", [">= 1.0.0"])
   gem.add_runtime_dependency("tzinfo-data", [">= 1.0.0"])
-  unless "".respond_to?(:scrub)
-    gem.add_runtime_dependency("string-scrub", [">= 0.1.1"])
-  end
+  gem.add_runtime_dependency("string-scrub", [">= 0.0.3", "<= 0.0.5"])
 
   gem.add_development_dependency("rake", [">= 0.9.2"])
   gem.add_development_dependency("flexmock", ["~> 1.3.3"])

data/lib/fluent/process.rb

@@ -40,7 +40,7 @@ module Fluent
       @parent_uri = DRb.uri
     end
 
-    def fork(delegate_object)
+    def fork(forward_interval, delegate_object)
       ipr, ipw = IO.pipe  # child Engine.emit_stream -> parent Engine.emit_stream
       opr, opw = IO.pipe  # parent target.emit -> child target.emit
 
@@ -49,14 +49,14 @@ module Fluent
         # parent process
         ipw.close
         opr.close
-        forward_thread = process_parent(ipr, opw, pid, delegate_object)
+        forward_thread = process_parent(ipr, opw, pid, forward_interval, delegate_object)
         return pid, forward_thread
       end
 
       # child process
       ipr.close
       opw.close
-      forward_thread = process_child(ipw, opr, delegate_object)
+      forward_thread = process_child(ipw, opr, forward_interval, delegate_object)
       return nil, forward_thread
     end
 
@@ -77,14 +77,14 @@ module Fluent
     end
 
     private
-    def process_child(ipw, opr, delegate_object)
+    def process_child(ipw, opr, forward_interval, delegate_object)
       DRb.start_service(create_drb_uri, delegate_object)
       child_uri = DRb.uri
 
       send_header(ipw, child_uri)
 
       # override target.emit_stream to write event stream to the pipe
-      fwd = new_forwarder(ipw, 0.5)  # TODO interval
+      fwd = new_forwarder(ipw, forward_interval)
       Engine.define_singleton_method(:emit_stream) do |tag,es|
         fwd.emit(tag, es)
       end
@@ -115,7 +115,7 @@ module Fluent
       ]
     end
 
-    def process_parent(ipr, opw, pid, delegate_object)
+    def process_parent(ipr, opw, pid, forward_interval, delegate_object)
       child_uri = read_header(ipr)
 
       # read event stream from the pipe and forward to Engine.emit_stream
@@ -127,7 +127,7 @@ module Fluent
 
       # return forwarder for DetachProcessMixin to
       # override target.emit and write event stream to the pipe
-      fwd = new_forwarder(opw, 0.5)  # TODO interval
+      fwd = new_forwarder(opw, forward_interval)
       # note: override emit method on DetachProcessMixin
       forward_thread.define_singleton_method(:forwarder) do
         fwd
@@ -300,11 +300,11 @@ module Fluent
 
     private
 
-    def detach_process_impl(num, &block)
+    def detach_process_impl(num, forward_interval, &block)
       children = []
 
       num.times do |i|
-        pid, forward_thread = DetachProcessManager.instance.fork(self)
+        pid, forward_thread = DetachProcessManager.instance.fork(forward_interval, self)
 
         if pid
           # parent process
@@ -438,11 +438,17 @@ module Fluent
           @detach_process = false
         end
       end
+
+      if forward_interval = conf['detach_process_forward_interval']
+        @forward_interval = Config.time_value(forward_interval)
+      else
+        @forward_interval = 0.5
+      end
     end
 
     def detach_process(&block)
       if @detach_process
-        detach_process_impl(1, &block)
+        detach_process_impl(1, @forward_interval, &block)
       else
         block.call
       end
@@ -480,13 +486,19 @@ module Fluent
           @detach_process = false
         end
       end
+
+      if forward_interval = conf['detach_process_forward_interval']
+        @forward_interval = Config.time_value(forward_interval)
+      else
+        @forward_interval = 0.5
+      end
     end
 
     private
 
     def detach_multi_process(&block)
       if @detach_process
-        detach_process_impl(@detach_process_num, &block)
+        detach_process_impl(@detach_process_num, @forward_interval, &block)
       else
         block.call
       end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.24'
+  VERSION = '0.12.25'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.24
+  version: 0.12.25
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -140,6 +140,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: string-scrub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement