forkr 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296b325468b389dccd6a7cbe882b7b6640a3d3a6
-  data.tar.gz: 9ee8107add29f14556346dbe34be3a5fde6111c0
+  metadata.gz: f0539b882a7e449399d84d53b5f84514db12af81
+  data.tar.gz: 41f718fe40fb072bd4c5e6f0e28953ac97f0d917
 SHA512:
-  metadata.gz: 83a7313ee48f3d29f6db182608094c119f27bc2f2ea3efda79aaa0b55590722c0604b34d8247c79b5b375f00ba686caaaf6f651d85bd2b05e37626a366bc4cef
-  data.tar.gz: c5c4baaefa584790d1517570a68e52d6cf9dbcd459c2088d9edf6872daef95d0290945265a005cb8df4e3a77609b70a91f6ba8ab7e5f79eda942f18f54bca79c
+  metadata.gz: 6c4f42032dee53cbfd4898dc0bdc9fae67146afdd68fe132c6d5338f4a9b21115057b8b981b70fde957a033266d66b471f2f06dd3313471c42c3de94c26802b6
+  data.tar.gz: bc1dd886ec97c7129f362bc56b2c9cd4fa4d98a5c6a45c7f93e1d74c2e7ebc8dfa10221380cd5bff34cf0f12c6fd7449be0bb16b307d63482b8048e08388e8fe

data/forkr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'forkr'
-  s.version     = '0.1.6'
-  s.date        = '2014-12-03'
+  s.version     = '0.1.7'
+  s.date        = '2015-03-22'
   s.summary     = "A pre-forking worker host - shamelessly inspired by unicorn."
   s.description = "Forkr is a preforking worker host, shamelessly inspired by unicorn. It exists to easily fork and scale ruby programs which aren't rack-based."
   s.authors     = ["Trey Evans"]

data/lib/forkr.rb

@@ -95,29 +95,31 @@ class Forkr
   end
 
   def master_loop
-    ensure_right_worker_count
-    loop do
-      fds = IO.select([@inbound],nil,nil,2)
-      unless fds.nil?
-        data_read = fds.first.first.read(1)
-        if data_read == "I"
-          shutdown_using(:INT)
-        elsif data_read == "T"
-          shutdown_using(:TERM)
-        elsif data_read == "Q"
-          shutdown_using(:QUIT)
-        elsif data_read == "+"
-          increment_workers
-        elsif data_read == "-"
-          decrement_workers
+    catch(:bail_because_im_a_worker) do
+      ensure_right_worker_count
+      loop do
+        fds = IO.select([@inbound],nil,nil,2)
+        unless fds.nil?
+          data_read = fds.first.first.read(1)
+          if data_read == "I"
+            shutdown_using(:INT)
+          elsif data_read == "T"
+            shutdown_using(:TERM)
+          elsif data_read == "Q"
+            shutdown_using(:QUIT)
+          elsif data_read == "+"
+            increment_workers
+          elsif data_read == "-"
+            decrement_workers
+          end
         end
+        prune_workers
+        ensure_right_worker_count
       end
-      prune_workers
-      ensure_right_worker_count
+      reap_all_workers
+      @outbound.close
+      @inbound.close
     end
-    reap_all_workers
-    @outbound.close
-    @inbound.close
   end
 
   def reap_all_workers
@@ -163,6 +165,7 @@ class Forkr
     @outbound.close
     $stderr.puts "Worker spawned as #{$$}!"
     @worker_client.run
+    throw(:bail_because_im_a_worker)
   end
 
   def child_dead?(pid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forkr
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Trey Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Forkr is a preforking worker host, shamelessly inspired by unicorn. It
   exists to easily fork and scale ruby programs which aren't rack-based.