einhorn 0.7.2 → 0.7.3

data/README.md

@@ -249,10 +249,9 @@ EventMachine-LE to support file-descriptor passing. Check out
 
 ## Compatibility
 
-Einhorn was developed and tested under Ruby 1.8.7.
+Einhorn runs in Ruby 2.0, 2.1, and 2.2
 
 ## About
 
-Einhorn is a project of [Stripe](https://stripe.com), led by [Greg
-Brockman](https://twitter.com/thegdb). Feel free to get in touch at
+Einhorn is a project of [Stripe](https://stripe.com), led by [Carl Jackson](https://github.com/zenazn). Feel free to get in touch at
 info@stripe.com.

data/einhorn.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.name          = 'einhorn'
   gem.require_paths = ['lib']
 
+  gem.add_development_dependency 'rack', '~> 1.6'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'minitest', '< 5.0'

data/lib/einhorn/command.rb

@@ -99,7 +99,7 @@ module Einhorn
     def self.signal_all(signal, children=nil, record=true)
       children ||= Einhorn::WorkerPool.workers
 
-      signaled = []
+      signaled = {}
       Einhorn.log_info("Sending #{signal} to #{children.inspect}", :upgrade)
 
       children.each do |child|
@@ -119,16 +119,23 @@ module Einhorn
           Process.kill(signal, child)
         rescue Errno::ESRCH
         else
-          signaled << child
+          signaled[child] = spec
         end
       end
 
-      if Einhorn::State.signal_timeout
+      if Einhorn::State.signal_timeout && record
         Einhorn::Event::Timer.open(Einhorn::State.signal_timeout) do
           children.each do |child|
-            next unless spec = Einhorn::State.children[child]
+            spec = Einhorn::State.children[child]
+            next unless spec # Process is already dead and removed by mourn
+            signaled_spec = signaled[child]
+            next unless signaled_spec # We got ESRCH when trying to signal
+            if spec[:spinup_time] != signaled_spec[:spinup_time]
+              Einhorn.log_info("Different spinup time recorded for #{child} after #{Einhorn::State.signal_timeout}s. This probably indicates a PID rollover.", :upgrade)
+              next
+            end
 
-            Einhorn.log_info("Child #{child.inspect} is still active after #{Einhorn::State.signal_timeout}. Sending SIGKILL.")
+            Einhorn.log_info("Child #{child.inspect} is still active after #{Einhorn::State.signal_timeout}s. Sending SIGKILL.")
             begin
               Process.kill('KILL', child)
             rescue Errno::ESRCH
@@ -138,7 +145,7 @@ module Einhorn
         end
       end
 
-      "Successfully sent #{signal}s to #{signaled.length} processes: #{signaled.inspect}"
+      "Successfully sent #{signal}s to #{signaled.length} processes: #{signaled.keys}"
     end
 
     def self.increment
@@ -291,14 +298,15 @@ module Einhorn
       end
 
       Einhorn.log_info("===> Launched #{pid} (index: #{index})", :upgrade)
+      Einhorn::State.last_spinup = Time.now
       Einhorn::State.children[pid] = {
         :type => :worker,
         :version => Einhorn::State.version,
         :acked => false,
         :signaled => Set.new,
-        :index => index
+        :index => index,
+        :spinup_time => Einhorn::State.last_spinup,
       }
-      Einhorn::State.last_spinup = Time.now
 
       # Set up whatever's needed for ACKing
       ack_mode = Einhorn::State.ack_mode
@@ -364,6 +372,7 @@ module Einhorn
     end
 
     def self.prepare_child_process
+      Process.setpgrp
       Einhorn.renice_self
     end
 

data/lib/einhorn/command/interface.rb

@@ -148,17 +148,17 @@ module Einhorn::Command
     ## Signals
     def self.install_handlers
       trap_async("INT") do
-        Einhorn::Command.signal_all("USR2", Einhorn::WorkerPool.workers)
+        Einhorn::Command.signal_all("USR2")
         Einhorn::Command.stop_respawning
       end
       trap_async("TERM") do
-        Einhorn::Command.signal_all("TERM", Einhorn::WorkerPool.workers)
+        Einhorn::Command.signal_all("TERM")
         Einhorn::Command.stop_respawning
       end
       # Note that quit is a bit different, in that it will actually
       # make Einhorn quit without waiting for children to exit.
       trap_async("QUIT") do
-        Einhorn::Command.signal_all("QUIT", Einhorn::WorkerPool.workers)
+        Einhorn::Command.signal_all("QUIT")
         Einhorn::Command.stop_respawning
         exit(1)
       end
@@ -169,12 +169,12 @@ module Einhorn::Command
       end
       trap_async("CHLD") {}
       trap_async("USR2") do
-        Einhorn::Command.signal_all("USR2", Einhorn::WorkerPool.workers)
+        Einhorn::Command.signal_all("USR2")
         Einhorn::Command.stop_respawning
       end
       at_exit do
         if Einhorn::State.kill_children_on_exit && Einhorn::TransientState.whatami == :master
-          Einhorn::Command.signal_all("USR2", Einhorn::WorkerPool.workers)
+          Einhorn::Command.signal_all("USR2")
           Einhorn::Command.stop_respawning
         end
       end
@@ -407,7 +407,7 @@ EOF
 
       signal = args[0] || "USR2"
 
-      response = Einhorn::Command.signal_all(signal, Einhorn::WorkerPool.workers)
+      response = Einhorn::Command.signal_all(signal)
       Einhorn::Command.stop_respawning
 
       "Einhorn is going down! #{response}"

data/lib/einhorn/event/connection.rb

@@ -57,13 +57,13 @@ module Einhorn::Event
     end
 
     def register!
-      log_info("client connected")
+      log_debug("client connected")
       Einhorn::Event.register_connection(self, @socket.fileno)
       super
     end
 
     def deregister!
-      log_info("client disconnected") if Einhorn::TransientState.whatami == :master
+      log_debug("client disconnected") if Einhorn::TransientState.whatami == :master
       Einhorn::Event.deregister_connection(@socket.fileno)
       super
     end

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,97 +1,126 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
+  prerelease: 
 platform: ruby
 authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !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,
@@ -106,8 +135,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CONTRIBUTORS
 - Gemfile
 - History.txt
@@ -157,27 +186,34 @@ 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'
+      segments:
+      - 0
+      hash: -3456360524100968279
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3456360524100968279
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: 'Einhorn: the language-independent shared socket manager'
+specification_version: 3
+summary: ! 'Einhorn: the language-independent shared socket manager'
 test_files:
 - test/_lib.rb
 - test/integration/_lib.rb
@@ -195,4 +231,3 @@ test_files:
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 9ad5953d5d76feb2ece4284c0c69db2ab3aa42d6
-  data.tar.gz: a9e7290ffcf43ba56b5987bb51a3a45a94e18d84
-SHA512:
-  metadata.gz: 9170d915de608cc8b467c474cbafaafbf4d0dbcac6103d446a67f3897a0c119247a213f84858b344a7c8ce2fa251be8e4370880bf35fbe92808831192c6191e1
-  data.tar.gz: 92d76cdf34932a638be91c330219658570113b07bfeb76fe24291d74d6c374ee6b19939a9c120138ccc958f0af921ac6f99fa833211e7614dfd1df71c164f890