distributed_demo 1.0 → 1.0.1

data/lib/client.rb

@@ -29,7 +29,14 @@ module Dist
 
       # spin up rack app
       require "roles/#{role}/app"
-      Thread.new { Rack::Handler::Mongrel.run App.new, :Port => rack_port.to_i }
+      @webserver = Thread.new do
+        begin
+          require 'mongrel'
+          Rack::Handler::Mongrel.run App.new, :Port => rack_port.to_i
+        rescue LoadError
+          Rack::Handler::WEBrick.run App.new, :Port => rack_port.to_i
+        end
+      end
 
       while true
         receive_message Messages::REQUEST_HEARTBEAT
@@ -42,7 +49,10 @@ module Dist
     private
 
     def leave_a_will
-      graceful_death = lambda { @socket.close }
+      graceful_death = lambda {
+        @socket.close rescue nil
+        @webserver.kill! if @webserver
+      }
       %w[INT TERM].each { |code| Signal.trap(code, &graceful_death) }
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: distributed_demo
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Tyler McMullen