spool 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b153eb818306253d14aff97ee0883c8ab19dd4bb
-  data.tar.gz: aadd1a7bdfdf4c8ffbe42b838059fd8ab14eb201
+  metadata.gz: c2ceedfd2a6bd4d1f326480ae51c527710282fad
+  data.tar.gz: b989fcc5b05800eb024673e14e1d60f3cc32a2cd
 SHA512:
-  metadata.gz: 1779bb5745a04e15f872eff5fb71117281498f44cd20c4b76ddfc156771b448acaae46375774fe783a93d0b8fb65a25962f85e21f0dd51e598b7ab73d75a8974
-  data.tar.gz: 8f042cf6b33a87c2262a9f528bfb8ffd9a17a835d9a6abf8c86d621cc34d9340ee9809f8a04974d4415d243c946c3b1798eaefbf8dca660ca5b531edd46546b9
+  metadata.gz: 2e47d2ccf341e8e0b3b077461e52ac395844fbf62288b468a7ce1949bb9688db74b40409f80c7fcdd903901f5c4b1fb965bb4af16f57b60b27c922400a7cf83c
+  data.tar.gz: c41197756bf9571ba469ca50cd1308a9b2cef7eb1077749c27a5c802c5464d889a5ddd4a40c8e7f1769bca599c4e65867c809d0328f2b03e9fe3d74ecc3e82db

data/lib/spool/pool.rb

@@ -56,16 +56,20 @@ module Spool
       logger.info(self.class) { "SPOOL START => #{format_processes}" }
 
       while running?
-        action = actions_queue.pop
-        
-        if action
-          logger.info(self.class) { "Starting action #{action[:name]} with params: [#{action[:args].join(', ')}]" }
-          send action[:name], *action[:args] 
-        end
-
-        if running?
-          check_status
-          sleep CHECK_TIMEOUT
+        begin
+          action = actions_queue.pop
+          
+          if action
+            logger.info(self.class) { "Starting action #{action[:name]} with params: [#{action[:args].join(', ')}]" }
+            send action[:name], *action[:args] 
+          end
+
+          if running?
+            check_status
+            sleep CHECK_TIMEOUT
+          end
+        rescue Exception => e
+          log_error e
         end
       end
 
@@ -98,7 +102,7 @@ module Spool
           working_processes << Spawner.spawn(configuration)
         end
 
-        logger.info(self.class) { "Status after new childrens => #{format_processes}}" }
+        logger.info(self.class) { "Status after new childrens => #{format_processes}" }
       elsif configuration.processes < working_processes.count
         count_to_kill = working_processes.count - configuration.processes
         logger.info(self.class) { "Killing #{count_to_kill} children. Current state => #{format_processes}" }
@@ -107,9 +111,6 @@ module Spool
 
         logger.info(self.class) { "After killing childers. Current State => #{format_processes}" }
       end
-
-    rescue Exception => e
-      log_error e
     end
 
     def _incr(count=1)
@@ -130,15 +131,12 @@ module Spool
       stop_processes working_processes
     end
 
-    def _stop(timeout=0)
+    def _stop
       logger.info(self.class) { "SPOOL STOP" }
 
       stop_processes working_processes
-      Timeout.timeout(timeout) { wait_for_stopped all_processes }
-    rescue Timeout::Error
-      logger.error(self.class) { "ERROR IN SPOOL STOP. Timeout error" }
-    ensure
-      _stop! 
+      wait_for_stopped all_processes
+
       @running = false
     end
 
@@ -154,11 +152,9 @@ module Spool
       end
 
       wait_for_stopped all_processes
-      
-      working_processes.clear
-      zombie_processes.clear
-      
+
       File.delete configuration.pid_file if File.exist? configuration.pid_file
+
       @running = false
     end
 
@@ -179,6 +175,8 @@ module Spool
       while processes_list.any?(&:alive?)
         sleep 0.01
       end
+
+      clear_dead_processes
     end
 
     def check_processes_to_restart

data/lib/spool/version.rb

@@ -1,3 +1,3 @@
 module Spool
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/pool_spec.rb

@@ -21,6 +21,7 @@ describe Spool::Pool do
       while pool.all_processes.count < pool.configuration.processes
         sleep 0.01
       end
+      sleep 0.1
     end
   end
 
@@ -119,22 +120,24 @@ describe Spool::Pool do
     pool.all_processes.each { |p| p.must_be :alive?}
   end
 
-  it 'Stop with timeout' do
+  it 'Stop waits for children to die gracefully' do
     pool = start_pool do
       processes 1
-      command 'ruby -e "Signal.trap(:QUIT) { puts :quit; sleep 5; exit 0 }; loop { sleep 1 }"'
+      command 'ruby -e "Signal.trap(:QUIT) { sleep 2; exit 0 }; loop { sleep 1 }"'
       stop_signal :QUIT
     end
 
+    sleep 1
+    
     process = pool.all_processes[0]
-
+    
     Benchmark.realtime do 
-      pool.stop 0.1
+      pool.stop
       while pool.running?
         sleep SLEEP_TIME
       end 
-    end.must_be :<, 1
-
+    end.must_be :>, 2
+    
     pool.must_be :stopped?
     pool.all_processes.must_be_empty    
     process.wont_be :alive?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spool
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datacenter