prefork_engine 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913fd5c478bf07925ad2f434c57c260b65377ee6
-  data.tar.gz: 2760508f97238333c076016edddb5fc97a693ac9
+  metadata.gz: 56cdbff6141cb4bb77c9fe7df36e2ec53a3641bb
+  data.tar.gz: 5d4be4fd3cd04b71d7ed436267697ba5341cf18a
 SHA512:
-  metadata.gz: ddfb88f037f3404eb74b3d518acc0bacaea5bdd0eb58540b329c2b7d6830a8c5fcadde8d83b4dcead4a1a1b83e61387c5d13373be1df428fc98b8ac2ef759ac1
-  data.tar.gz: 63ed40cfb577c17e28e127310816ae66a6886870468616805a346a93028d2606565c1c141d9a69760a9d33f2ce799624fd6feeff51f6ebd35f71d8d15f08fb6a
+  metadata.gz: f653a9d4b21562c5a30f4b797737e1ec4a2f3a3330c009391bb648776fc185e3c6f43e3554777b0297933072b4595c8d368fcdea361368108279e14621c5a272
+  data.tar.gz: 93db0815f2a0627532dbe3a8e83369e4ae7641e3bd0f07e513116f2544419ec6115a73bd5a09014f39185358ea8d0aa75538509f45bd726614783f9155394f78

data/.travis.yml

@@ -3,3 +3,5 @@ rvm:
   - 2.0.0
   - 2.1.5
   - 2.2.3
+before_install:
+  - gem update bundler

data/Changes

@@ -1,3 +1,7 @@
+0.0.7
+
+   - Use Timeout.timeout #2
+
 0.0.6
 
     - implement wait_all_children(timeout)

data/lib/prefork_engine.rb

@@ -44,7 +44,8 @@ class PreforkEngine
 
     # main loop
     while @signal_received.length == 0
-      action = self._decide_action() if @_no_adjust_until <= Time.now.to_f
+      action = @_no_adjust_until <= Time.now.to_f ? self._decide_action() : 0
+
       if action > 0
         # start a new worker
         if @options["before_fork"]
@@ -77,7 +78,7 @@ class PreforkEngine
           @worker_pids[pid] = @generation
           self._update_spawn_delay(@options["spawn_interval"])
       end
-      if r = self._wait(action <= 0 ? 1 : 0)
+      if r = self._wait(action <= 0)
         self._on_child_reap(r.pid, r.status)
         if @worker_pids.delete(r.pid) == @generation && r.status != 0
           self._update_spawn_delay(@options["err_respawn_interval"])
@@ -150,7 +151,7 @@ class PreforkEngine
   def wait_all_children(timeout = 0)
     wait_loop = proc {
       while !@worker_pids.keys.empty?
-        if r = self._wait(1)
+        if r = self._wait(true)
           if @worker_pids.delete(r.pid)
             self._on_child_reap(r.pid, r.status)
           end
@@ -159,7 +160,7 @@ class PreforkEngine
     }
     if timeout > 0
       begin
-       timeout(timeout){
+       Timeout.timeout(timeout){
          wait_loop.call
        }
      rescue Timeout::Error
@@ -182,7 +183,7 @@ class PreforkEngine
     else
       delayed_task_sleep = self._handle_delayed_task()
       delayed_fork_sleep = self._decide_action > 0 ? [@_no_adjust_until - Time.now.to_f,0].max : nil
-      sleep_secs = [delayed_task_sleep,delayed_fork_sleep,self._max_wait].select {|v| v != nil}
+      sleep_secs = [delayed_task_sleep,delayed_fork_sleep,self._max_wait].compact
       begin
         if sleep_secs.min != nil
           sleep(sleep_secs.min)

data/lib/prefork_engine/version.rb

@@ -1,3 +1,3 @@
 class PreforkEngine
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefork_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: a simple prefork server framework