fluent-plugin-multiprocess 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2EwM2RlNTJkYTUzMzY0ZjljODQ4MDgxZjM3NWEwMGYwZDAxODc3Zg==
+    ZjMyZjczODc2OThlMzRmYWEyZDAzM2ZjMDQxZDZjYTM3MWI2NTQ3ZA==
   data.tar.gz: !binary |-
-    MTU4MzQzYTY2ZTliZjcyNTRkZGJjNGMzNjVlOTRhZDE5MDdjMzc5ZQ==
+    MzQ1ZTUyOGE3NTdhMDE1NTkyODM0YjZkOWZjOGVlNDBjMTFlNzg0Nw==
 SHA512:
   metadata.gz: !binary |-
-    Yjk4NDU4MDM0ZDM0M2ExMDNmZDc3Y2Y5ZTRlY2E1NzkwNzdkMzY0YjBiZDM3
-    YmNmY2ZjNmNlNmJmOTJkYzQ4Mjc1YzIwMDM5NWUzZmFmNzliOTBlNmYyNGE0
-    NzVkN2UzZjM0MThkMWJhNjk2ZmNhMWI1OWU3MjJmNDFkYTdlZmU=
+    N2YyM2Q2MmNlNWM3ZmQ3ZTJjOWRjODRkZjZmNjcwYWExZDE2YTY2MjYzMjgz
+    MWZlOThiMDdiZTZhOTljMjhhM2EyYjhjYjkzMjhkMjEyNjgzM2NlMTFkMjMx
+    OGU5MjA3ZGRmN2EyN2Q0OTliNTQ3MjA3NTg3Y2YxMzMyYmJhN2I=
   data.tar.gz: !binary |-
-    YjdmMGVlYWU5MzFiNjUwM2JiOTkwODhmMzdkNDk1ODZkNGUyMmU0MjAzZjhh
-    YjQ2YTczOTk1YmMzNTdmZmIxOTk0MDQ5ZGRmZTljZDBiMzdkNTlmNmQzNWRi
-    YTMyNzY3NGYyNjIzZmJiODQwMTAyMDE5ZTg2YWY4OWI1YTE3NDc=
+    NDZiZTZiZDk2ZjU3NGFhMzg3MTk3NmU4ZDU4YjFhZjA2ZjgwYWRjMGJjMzY5
+    M2E3MjlmZmZhYjk2Mzk5ZDEyNzFjOWE5ZmNhMzY4MWY5ODVjYTM5MmRmYjJk
+    OGQ5MDQ5ODEyNGY3YTg3NWZkMmIyZDkwNTA4NjU4NTRjODYxYWE=

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/fluent-plugin-multiprocess.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path('../lib', __FILE__)
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-multiprocess"
   gem.description = "Multiprocess agent plugin for Fluentd event collector"
-  gem.homepage    = "https://github.com/frsyuki/fluent-plugin-fluentd"
+  gem.homepage    = "https://github.com/fluent/fluent-plugin-multiprocess"
   gem.summary     = gem.description
   gem.version     = File.read("VERSION").strip
   gem.authors     = ["Sadayuki Furuhashi"]

data/lib/fluent/plugin/in_multiprocess.rb

@@ -26,6 +26,7 @@ module Fluent
     config_param :graceful_kill_interval, :time, :default => 2
     config_param :graceful_kill_interval_increment, :time, :default => 3
     config_param :graceful_kill_timeout, :time, :default => 60
+    config_param :keep_file_descriptors, :bool, :default => nil
 
     class ProcessElement
       include Configurable
@@ -33,11 +34,14 @@ module Fluent
       config_param :cmdline, :string
       config_param :sleep_before_start, :time, :default => 0
       config_param :sleep_before_shutdown, :time, :default => 0
+      config_param :keep_file_descriptors, :bool, :default => nil
 
       attr_accessor :process_monitor
     end
 
     def configure(conf)
+      super
+
       @processes = conf.elements.select {|e|
         e.name == 'process'
       }.map {|e|
@@ -65,7 +69,9 @@ module Fluent
         cmd = "#{Shellwords.shellescape(RbConfig.ruby)} #{Shellwords.shellescape(fluentd_rb)} #{pe.cmdline}"
         sleep pe.sleep_before_start if pe.sleep_before_start > 0
         $log.info "launching child fluentd #{pe.cmdline}"
-        pe.process_monitor = @pm.spawn(cmd)
+        keep_file_descriptors = pe.keep_file_descriptors.nil? ? @keep_file_descriptors : pe.keep_file_descriptors
+        options = {:close_others => !keep_file_descriptors}
+        pe.process_monitor = @pm.spawn(cmd, options)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-multiprocess
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -72,7 +72,7 @@ files:
 - example_child2.conf
 - fluent-plugin-multiprocess.gemspec
 - lib/fluent/plugin/in_multiprocess.rb
-homepage: https://github.com/frsyuki/fluent-plugin-fluentd
+homepage: https://github.com/fluent/fluent-plugin-multiprocess
 licenses:
 - Apache 2.0
 metadata: {}