prefork_engine 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a157189f67ca8ff55ffe74a4936b211bb2155a
-  data.tar.gz: fcfcc6aa5b119c87bc10ac30381d70c73aa78108
+  metadata.gz: d61cdcde16f3e999e4fb7335f9f799bec53dd4ec
+  data.tar.gz: aca8bdb8dde327a138f9d3291f998c3aecbdc004
 SHA512:
-  metadata.gz: 0cba3a2971b80f3a916b8b650113c68432f183dfab274f7b490c281fe809dd128750150bbc8485c770344f4a470a41c6ccd31812207cf2e8411b4780569816e9
-  data.tar.gz: b6fb8e007f2d5f74cef6c16b59354c64400df5c894778b59e00d171e1af3bc92ce1342bc2a4c5ead767367f15609b91eeada9c7795cf5ba97847b92366d0f3f9
+  metadata.gz: 7d9b252d0eee1b472bc81c01fd76b367ad354637466018dd6367f55780d17289056bbd3d13b45d726d07b3003d4fe2089c322ef94fafa7e8c604d80ae3c4e8c9
+  data.tar.gz: 099b01f4de3e829ef010bc34519ac2fcd7665ff8a77bb8f67a054d55756a80588cff5a5b3e4f8a52bddc886743736c490341e0198910f537b3557f8f5075a4f7

data/Changes

@@ -1,3 +1,7 @@
+0.0.5 2014-12-19T16:39:31Z
+
+    - clean up code
+
 0.0.4 2014-12-16T16:45:52Z
 
     - sleep after EINTR for waiting for signal handler

data/lib/prefork_engine.rb

@@ -26,13 +26,13 @@ class PreforkEngine
     @worker_pids = {}
     @delayed_task = nil
     @options["trap_signals"].each do |k,kv|
-      Signal.trap(k) { |signo|
+      Signal.trap(k) do |signo|
         @signal_received = Signal.signame(signo)
-      }
+      end
     end
-    Signal.trap("CHLD") {
+    Signal.trap("CHLD") do
       #do nothing
-    }
+    end
   end
 
   def start(&block)
@@ -44,9 +44,9 @@ class PreforkEngine
     # main loop
     while @signal_received.length == 0
       action = self._decide_action() if @_no_adjust_until <= Time.now.to_f
-      if action > 0 then
+      if action > 0
         # start a new worker
-        if @options["before_fork"] then
+        if @options["before_fork"]
            @options["before_fork"].call(self)
         end
         pid = nil
@@ -54,11 +54,11 @@ class PreforkEngine
           pid = fork
         rescue => e
           # fork failed
-          warn "fork failed:#{e}";
+          warn "fork failed:#{e}"
           self._update_spawn_delay(@options["err_respawn_interval"])
           next
         end
-          if pid == nil then
+          if pid == nil
             @in_child = true
             @options["trap_signals"].each do |k,kv|
               ## Signal.trap(k, 0) #XXX in rspec only?
@@ -70,30 +70,30 @@ class PreforkEngine
             exit!(true)
           end
           # parent
-          if @options["after_fork"] then
+          if @options["after_fork"]
              @options["after_fork"].call(self)
           end
           @worker_pids[pid] = @generation
           self._update_spawn_delay(@options["spawn_interval"])
       end
-      if r = self._wait() then
+      if r = self._wait()
         self._on_child_reap(r.pid, r.status)
-        if @worker_pids.delete(r.pid) == @generation && r.status != 0 then
+        if @worker_pids.delete(r.pid) == @generation && r.status != 0
           self._update_spawn_delay(@options["err_respawn_interval"])
         end
       end
     end
 
     # send signals to workers
-    if action = self._action_for(@signal_received) then
+    if action = self._action_for(@signal_received)
       sig = action[0]
       interval = action[1]
-      if interval > 0 then
+      if interval > 0
         pids = @worker_pids.keys.sort
         @delayed_task = proc {
           pid = pids.shift
           Process.kill(sig, pid)
-          if pids.empty? then
+          if pids.empty?
             @delayed_task = nil
             @delayed_task_at = nil
           else
@@ -125,7 +125,7 @@ class PreforkEngine
   end #_decide_action
 
   def _on_child_reap(pid,status)
-    if @options["on_child_reap"] then
+    if @options["on_child_reap"]
       @options["on_child_reap"].call(pid,status)
     end
   end
@@ -133,7 +133,7 @@ class PreforkEngine
   def _handle_delayed_task
     while true
       return nil if !@delayed_task
-      timeleft = @delayed_task_at - Time.now.to_f;
+      timeleft = @delayed_task_at - Time.now.to_f
       return timeleft if timeleft > 0
       @delayed_task.call
     end
@@ -149,8 +149,8 @@ class PreforkEngine
   def wait_all_children
     #XXX todo timeout
     while !@worker_pids.keys.empty?
-      if r = self._wait() then
-        if @worker_pids.delete(r.pid) then
+      if r = self._wait()
+        if @worker_pids.delete(r.pid)
           self._on_child_reap(r.pid, r.status)
         end
       end
@@ -168,7 +168,7 @@ class PreforkEngine
     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}
     begin
-      if sleep_secs.min != nil then
+      if sleep_secs.min != nil
         sleep(sleep_secs.min)
         # nonblock
         return Process.wait3(1)

data/lib/prefork_engine/version.rb

@@ -1,3 +1,3 @@
 class PreforkEngine
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefork_engine
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Masahiro Nagano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler