ringleader 1.1.4 → 1.1.5.pre0

data/lib/ringleader/cli.rb

@@ -15,7 +15,7 @@ module Ringleader
       die "must provide a filename" if argv.empty?
       die "could not find config file #{argv.first}" unless File.exist?(argv.first)
 
-      if opts.verbose?
+      if opts.verbose
         Celluloid.logger.level = ::Logger::DEBUG
       end
 

data/lib/ringleader/controller.rb

@@ -23,7 +23,7 @@ module Ringleader
       @stopping = true
       info "shutting down..."
       @apps.values.map do |app|
-        Thread.new { app.stop }
+        Thread.new { app.stop if app.alive? }
       end.map(&:join)
     end
   end

data/lib/ringleader/process.rb

@@ -30,6 +30,7 @@ module Ringleader
     #
     # Returns true if the app started, false if not.
     def start
+      return false if @stopping
       if @running
         true
       elsif @starting
@@ -54,6 +55,7 @@ module Ringleader
     # zombies), use KILL instead.
     def stop
       return unless @pid
+      @stopping = true
 
       children = child_pids @pid
 
@@ -94,6 +96,7 @@ module Ringleader
       @pid = nil
       @wait_for_port.terminate if @wait_for_port.alive?
       @wait_for_exit.terminate if @wait_for_exit.alive?
+      @stopping = nil
       signal :running, false
     end
 
@@ -178,8 +181,9 @@ module Ringleader
     end
 
     # Internal: kill orphaned processes
-    def reap_orphans(child_pids)
-      child_pids.each do |pid|
+    def reap_orphans(pids)
+      pids.each do |pid|
+        debug "checking for child #{pid}"
         next unless Sys::ProcTable.ps(pid)
         error "child process #{pid} was orphaned, killing it"
         begin
@@ -192,6 +196,7 @@ module Ringleader
 
     # Internal: returns all child pids of the given parent
     def child_pids(parent_pid)
+      debug "retrieving child pids of #{parent_pid}"
       proc_table = Sys::ProcTable.ps
       children_of parent_pid, proc_table
     end

data/lib/ringleader/socket_proxy.rb

@@ -27,8 +27,11 @@ module Ringleader
 
     def proxy(from, to)
       ::IO.copy_stream from, to
-    rescue IOError
+    rescue EOFError
       # from or to were closed
+    rescue IOError, SystemCallError => e
+      # something else went wrong, like a connection reset or timeout: log it
+      error e
     ensure
       from.close unless from.closed?
       to.close unless to.closed?

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.1.4"
+  VERSION = "1.1.5.pre0"
 end

data/ringleader.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "trollop", "~> 1.16.2"
   gem.add_dependency "rainbow", "~> 1.1.4"
   gem.add_dependency "color", "~> 1.4.1"
-  gem.add_dependency "sys-proctable", "~> 0.9.3"
+  gem.add_dependency "sys-proctable", "= 0.9.1"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 2.11.0"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.1.4
-  prerelease: 
+  version: 1.1.5.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Nathan Witmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -112,17 +112,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -256,12 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3327461616864805707
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23