einhorn 0.6.3 → 0.6.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8dd68fe54324e7abf44e651b0841e8d39454aee1
+  data.tar.gz: edb62157f36f162ec5c27392fb03fa7651d8052a
+SHA512:
+  metadata.gz: 9f6ee548ff87a39a3475b9259f72b11f5209cf4146c038ef431e059d2d10f6a1c8c4283987a861c998b0b397219822c7802e17bfceaa61b180966d17120e1d17
+  data.tar.gz: c2bc5eae5def2f598c2777c71b58bf321adc72adf652c2ee71bbbeec1e2acd75c0e41225c69fb9e800c62872ffac860bb4c6f87119cb4a9acfd0799231d89d9a

data/bin/einhorn

@@ -309,6 +309,10 @@ if true # $0 == __FILE__
       exit 0
     end
 
+    opts.on('--signal-timeout=T', '-t', 'If children do not react to signals after T seconds, escalate to SIGKILL') do |t|
+      Einhorn::State.signal_timeout = Integer(t)
+    end
+
     opts.on('--version', 'Show version') do
       puts Einhorn::VERSION
       exit

data/lib/einhorn/command.rb

@@ -123,6 +123,21 @@ module Einhorn
         end
       end
 
+      if Einhorn::State.signal_timeout
+        Einhorn::Event::Timer.open(Einhorn::State.signal_timeout) do
+          children.each do |child|
+            next unless spec = Einhorn::State.children[child]
+
+            Einhorn.log_info("Child #{child.inspect} is still active after #{Einhorn::State.signal_timeout}. Sending SIGKILL.")
+            begin
+              Process.kill('KILL', child)
+            rescue Errno::ESRCH
+            end
+            spec[:signaled].add('KILL')
+          end
+        end
+      end
+
       "Successfully sent #{signal}s to #{signaled.length} processes: #{signaled.inspect}"
     end
 

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/lib/einhorn.rb

@@ -78,6 +78,7 @@ module Einhorn
         :nice => {:master => nil, :worker => nil, :renice_cmd => '/usr/bin/renice'},
         :reexec_commandline => nil,
         :drop_environment_variables => [],
+        :signal_timeout => nil,
       }
     end
 

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.6.3
-  prerelease: 
+  version: 0.6.4
 platform: ruby
 authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: chalk-rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Einhorn makes it easy to run multiple instances of an application server,
@@ -119,8 +106,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS
 - Gemfile
 - History.txt
@@ -179,28 +166,27 @@ files:
 homepage: https://github.com/stripe/einhorn
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: ! 'Einhorn: the language-independent shared socket manager'
+specification_version: 4
+summary: 'Einhorn: the language-independent shared socket manager'
 test_files:
 - test/_lib.rb
 - test/integration/_lib.rb
@@ -218,4 +204,3 @@ test_files:
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
-has_rdoc: