ringleader 1.0.2 → 1.0.3

data/README.md

@@ -95,6 +95,8 @@ main_app:
   env:                     # Override or set environment variables inherited
     FOO: hello             # from the current environment. Use nil to unset a
     BAR: nil               # var.
+  kill_with: TERM          # Signal to use to kill the process tree with. Use
+                           # KILL if the default (TERM) is leaving zombies.
 
   # If you have an application managed by rvm, this setting automatically adds
   # the rvm-specific shell setup before executing the given command. This

data/lib/ringleader/cli.rb

@@ -101,6 +101,8 @@ something like this:
       env:                     # Override or set environment variables inherited
         FOO: hello             # from the current environment. Use nil to unset a
         BAR: nil               # var.
+      kill_with: TERM          # Signal to use to kill the process tree with. Use
+                               # KILL if the default (TERM) is leaving zombies.
 
       # If you have an application managed by rvm, this setting automatically
       # adds the rvm-specific shell setup before executing the given command.

data/lib/ringleader/config.rb

@@ -37,6 +37,7 @@ module Ringleader
         options["host"] ||= DEFAULT_HOST
         options["idle_timeout"] ||= DEFAULT_IDLE_TIMEOUT
         options["startup_timeout"] ||= DEFAULT_STARTUP_TIMEOUT
+        options["kill_with"] ||= "TERM"
         options["env"] ||= {}
 
         if command = options.delete("rvm")
@@ -44,6 +45,8 @@ module Ringleader
         elsif command = options.delete("rbenv")
           options["command"] = "rbenv exec #{command}"
           options["env"]["RBENV_VERSION"] = nil
+          options["env"]["RBENV_DIR"] = nil
+          options["env"]["GEM_HOME"] = nil
         end
 
         validate name, options

data/lib/ringleader/process.rb

@@ -47,16 +47,20 @@ module Ringleader
     # Public: stop the application.
     #
     # Sends a SIGTERM to the app's process, and expects it to exit like a sane
-    # and well-behaved application within 30 seconds before sending a SIGKILL.
+    # and well-behaved application within 7 seconds before sending a SIGKILL.
+    #
+    # Uses config.kill_with for the initial signal, which defaults to "TERM".
+    # If a configured process doesn't respond well to TERM (i.e. leaving
+    # zombies), use KILL instead.
     def stop
       return unless @pid
 
       info "stopping #{@pid}"
       @master.close unless @master.closed?
-      debug "kill -TERM #{@pid}"
-      ::Process.kill "TERM", -@pid
+      debug "kill -#{config.kill_with} #{@pid}"
+      ::Process.kill config.kill_with, -@pid
 
-      kill = after 30 do
+      kill = after 7 do
         if @running
           warn "process #{@pid} did not shut down cleanly, killing it"
           debug "kill -KILL #{@pid}"

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/ringleader/config_spec.rb

@@ -35,6 +35,10 @@ describe Ringleader::Config do
         expect(subject.apps["main_site"].env).to eq({})
         expect(subject.apps["admin"].env).to have_key("OVERRIDE")
       end
+
+      it "sets 'TERM' as the default kill signal" do
+        expect(subject.apps["main_site"].kill_with).to eq("TERM")
+      end
     end
   end
 
@@ -73,8 +77,11 @@ describe Ringleader::Config do
     it "replaces the 'rbenv' command with an rbenv command and environment" do
       config = Ringleader::Config.new "spec/fixtures/rbenv.yml"
       expect(config.apps["rbenv_app"].command).to eq("rbenv exec bundle exec foreman start")
-      expect(config.apps["rbenv_app"].env).to have_key("RBENV_VERSION")
-      expect(config.apps["rbenv_app"].env["RBENV_VERSION"]).to eq(nil)
+
+      %w(RBENV_VERSION RBENV_DIR GEM_HOME).each do |key|
+        expect(config.apps["rbenv_app"].env).to have_key(key)
+        expect(config.apps["rbenv_app"].env[key]).to eq(nil)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -240,9 +240,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -834861029563874532
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24