fluent-plugin-multiprocess 0.1.2 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjMyZjczODc2OThlMzRmYWEyZDAzM2ZjMDQxZDZjYTM3MWI2NTQ3ZA==
-  data.tar.gz: !binary |-
-    MzQ1ZTUyOGE3NTdhMDE1NTkyODM0YjZkOWZjOGVlNDBjMTFlNzg0Nw==
+SHA1:
+  metadata.gz: e48192b877aec8789d3f5b8cf783809230b04995
+  data.tar.gz: e5a6014ced8cc68e46dfb46e1d7a9cf46ec8ea11
 SHA512:
-  metadata.gz: !binary |-
-    N2YyM2Q2MmNlNWM3ZmQ3ZTJjOWRjODRkZjZmNjcwYWExZDE2YTY2MjYzMjgz
-    MWZlOThiMDdiZTZhOTljMjhhM2EyYjhjYjkzMjhkMjEyNjgzM2NlMTFkMjMx
-    OGU5MjA3ZGRmN2EyN2Q0OTliNTQ3MjA3NTg3Y2YxMzMyYmJhN2I=
-  data.tar.gz: !binary |-
-    NDZiZTZiZDk2ZjU3NGFhMzg3MTk3NmU4ZDU4YjFhZjA2ZjgwYWRjMGJjMzY5
-    M2E3MjlmZmZhYjk2Mzk5ZDEyNzFjOWE5ZmNhMzY4MWY5ODVjYTM5MmRmYjJk
-    OGQ5MDQ5ODEyNGY3YTg3NWZkMmIyZDkwNTA4NjU4NTRjODYxYWE=
+  metadata.gz: 3188545bc5a4d78367f297a6d37ebddead7051c24e54b3774b9a08bb339c131013454af251bd40bbd0d0c6a5fd329153ae8eb2b45b339dae1a13f53f06561ec0
+  data.tar.gz: 6ae0935a863b11210207409e7fc430a15018e0785ea0714ab540528449a61c734cfa54e91791254a753d744781e86afec072a913927e4870aed3d6c3e7c0bb2c

data/README.md

@@ -20,20 +20,27 @@ This plugin just controls start & shutdown of child processes.
       #graceful_kill_timeout 60s
 
       <process>
-        cmdline -c /etc/fluent/fluentd_child1.conf
+        cmdline -c /etc/fluent/fluentd_child1.conf --log /var/log/fluent/fluentd_child1.log
+        pid_file /var/run/fluentd_child1.pid
       </process>
       <process>
-        cmdline -c /etc/fluent/fluentd_child2.conf
+        cmdline -c /etc/fluent/fluentd_child2.conf --log /var/log/fluent/fluentd_child2.log
         sleep_before_start 5s
+        pid_file /var/run/fluentd_child2.pid
       </process>
       <process>
-        cmdline -c /etc/fluent/fluentd_child3.conf
+        cmdline -c /etc/fluent/fluentd_child3.conf --log /var/log/fluent/fluentd_child3.log
         sleep_before_shutdown 5s
+        pid_file /var/run/fluentd_child3.pid
       </process>
     </source>
 
-- **process** section sets command line arguments of a child process. This plugin creates one child process for each \<process\> section
-- **cmdline** option is required in a \<process\> section
-- **sleep\_before\_start** sets wait time before starting the process. Note that child processes **start from last to first** (`fluentd_child3` -\> `sleep 5` -\> { `fluentd_child2`, `fluentd_child1` } in this case)
-- **sleep\_before\_shutdown** sets wait time before shutting down the process. Note that child processes **shutdown from first to last** ({ `fluentd_child1`, `fluentd_child2` } -\> `sleep 5` -> `fluentd_child3` in this case)
+- **process**: section sets command line arguments of a child process. This plugin creates one child process for each \<process\> section
+- **cmdline**: This parameter is required in a \<process\> section
+- **sleep\_before\_start**: Optional. Sets wait time before starting the process. Note that child processes **start from last to first** (`fluentd_child3` -\> `sleep 5` -\> { `fluentd_child2`, `fluentd_child1` } in this case)
+- **sleep\_before\_shutdown**: Optional. Sets wait time before shutting down the process. Note that child processes **shutdown from first to last** ({ `fluentd_child1`, `fluentd_child2` } -\> `sleep 5` -> `fluentd_child3` in this case)
+- **pid_file**: Optional. Writes child process id to this file. This is useful for sending a signal to child processes.
 
+### Logs for daemonized processes
+
+Daemonized fluentd closes its STDOUT. So child processes on daemonized fluentd & in_multiprocess doesn't put its logs without `--log` option. Specifing `--log` option always is best practice to help this situation.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/fluent-plugin-multiprocess.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.license = "Apache 2.0"
 
-  gem.add_dependency "fluentd", [">= 0.10.0", "< 0.13.0"]
-  gem.add_dependency "serverengine", "~> 1.5.5"
+  gem.add_dependency "fluentd", [">= 0.10.0", "< 2"]
+  gem.add_dependency "serverengine", "~> 1.6"
   gem.add_development_dependency "rake", ">= 0.9.2"
 end

data/lib/fluent/plugin/in_multiprocess.rb

@@ -35,6 +35,7 @@ module Fluent
       config_param :sleep_before_start, :time, :default => 0
       config_param :sleep_before_shutdown, :time, :default => 0
       config_param :keep_file_descriptors, :bool, :default => nil
+      config_param :pid_file, :string, :default => nil
 
       attr_accessor :process_monitor
     end
@@ -72,6 +73,8 @@ module Fluent
         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)
+
+        create_pid_file(pe) if pe.pid_file
       end
     end
 
@@ -84,6 +87,19 @@ module Fluent
       @processes.each {|pe|
         pe.process_monitor.join
       }
+      @processes.each { |pe|
+        delete_pid_file(pe) if pe.pid_file
+      }
+    end
+
+    def create_pid_file(pe)
+      File.open(pe.pid_file, "w") { |f|
+        f.write pe.process_monitor.pid
+      }
+    end
+
+    def delete_pid_file(pe)
+      File.unlink(pe.pid_file) if File.exist?(pe.pid_file)
     end
   end
 

metadata

@@ -1,61 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-multiprocess
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 description: Multiprocess agent plugin for Fluentd event collector
@@ -82,12 +82,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -97,4 +97,3 @@ signing_key:
 specification_version: 4
 summary: Multiprocess agent plugin for Fluentd event collector
 test_files: []
-has_rdoc: false