spool 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e4c82fbd14fdb037f521f157995675fd3218bf1
-  data.tar.gz: e1fd8caed3c81ec0d5ba7ced3d5a9907a69f16ab
+  metadata.gz: ded6da3c7760ef6ba4bf10f1d20c836f69901c0b
+  data.tar.gz: 31597cc84078b8289b7fb93089531d29e233e626
 SHA512:
-  metadata.gz: 6b328d4596f62dd9bc01ad6bd9195f37a8b3d441ce18f2c929e2e01f36a9e49aa493f335bb55191bb848cf618440edd04da5440da3646085aab1f19ad4c7840e
-  data.tar.gz: 4a8603056e5c0ded5f2fb226354795c1ab9261af04f2392772c4b4053b0a8a41a3f20f956f1ab3852024f3ba4e810d49b9f6600416837effd0e48fdd3ee425fc
+  metadata.gz: 8b172a8077738059e68bb160b60892355cfce88aabf6bc18c03eacba4c927aa936a36924093bc4b7a5d153eb107be287a65170bd1345f71f045d10a07c71129c
+  data.tar.gz: bf20887bd046790fb8ffc65fd803dc28b953283c00f02d075ca210c1b3389a8d45b7e744127d19d0d07ec2d9fc25a80e421b93fe423edc7853cf1687d4c07551

data/lib/spool/configuration.rb

@@ -63,7 +63,6 @@ module Spool
       @logger ||= MonoLogger.new(log_file).tap do |logger|
         logger.level = MonoLogger.const_get log_level
         logger.formatter = log_formatter
-        Datacenter.logger = logger
       end
     end
 

data/lib/spool/pool.rb

@@ -13,11 +13,12 @@ module Spool
       TTOU: :decr
     }
 
-    attr_reader :configuration, :processes
+    attr_reader :configuration, :working_processes, :zombie_processes
     
     def initialize(configuration=nil, &block)
       @configuration = configuration || DSL.configure(&block)
-      @processes = []
+      @working_processes = []
+      @zombie_processes = Set.new
       @running = false
       @actions_queue = []
     end
@@ -30,6 +31,10 @@ module Spool
       !running?
     end
 
+    def all_processes
+      working_processes + zombie_processes.to_a
+    end
+
     [:incr, :decr, :reload, :restart, :stop, :stop!].each do |method|
       define_method method do |*args|
         actions_queue.push(name: "_#{method}".to_sym, args: args)
@@ -45,10 +50,10 @@ module Spool
       File.write configuration.pid_file, Process.pid if configuration.pid_file
 
       configuration.processes.times.map do
-        processes << Spawner.spawn(configuration)
+        working_processes << Spawner.spawn(configuration)
       end
 
-      logger.info(self.class) { "SPOOL START childrens: #{processes.map(&:pid)}" }
+      logger.info(self.class) { "SPOOL START => #{format_processes}" }
 
       while running?
         action = actions_queue.pop
@@ -69,6 +74,7 @@ module Spool
 
     private
 
+    attr_writer :working_processes, :zombie_processes
     attr_reader :actions_queue
 
     def handle_signals
@@ -81,36 +87,31 @@ module Spool
     end
 
     def check_status
-      processes.delete_if { |p| !p.alive? }
-      
-      to_restart = processes.select(&configuration.restart_condition)
-      logger.info(self.class) {"Restart condition successful in child processes: #{to_restart.map(&:pid)}"} if to_restart.any?
-      stop_processes to_restart
+      clear_dead_processes
 
-      if configuration.processes > processes.count
-        logger.info(self.class) { "Initialize new children: #{processes.map(&:pid)}" }
+      check_processes_to_restart
+      
+      if configuration.processes > all_processes_count
+        logger.info(self.class) { "Initializing new children. Current State => #{format_processes}" }
 
-        (configuration.processes - processes.count).times do
-          processes << Spawner.spawn(configuration)
+        (configuration.processes - all_processes_count).times do
+          working_processes << Spawner.spawn(configuration)
         end
 
-        logger.info(self.class) { "New children: #{processes.map(&:pid)}" }
-      elsif configuration.processes < processes.count
-        logger.info(self.class) { "Kill childrens: #{processes.map(&:pid)}" }
+        logger.info(self.class) { "New children: #{working_processes.last.pid}" }
+      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}" }
 
-        list = processes.take(processes.count - configuration.processes)
-        stop_processes list
-        wait_for_stopped list
-        list.each { |p| processes.delete p }
+        stop_processes working_processes.take(count_to_kill)
 
-        logger.info(self.class) { "After kill childrens: #{processes.map(&:pid)}" }
+        logger.info(self.class) { "After killing childers. Current State => #{format_processes}" }
       end
 
     rescue Exception => e
       log_error e
     end
 
-
     def _incr(count=1)
       configuration.processes += count
     end
@@ -126,14 +127,14 @@ module Spool
 
     def _restart
       logger.info(self.class) { "RESTART" }
-      stop_processes processes
+      stop_processes working_processes
     end
 
     def _stop(timeout=0)
       logger.info(self.class) { "SPOOL STOP" }
 
-      stop_processes processes
-      Timeout.timeout(timeout) { wait_for_stopped processes }
+      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
@@ -142,23 +143,20 @@ module Spool
     end
 
     def _stop!
-      logger.info(self.class) { "SPOOL STOP! kill this children (#{processes.map(&:pid)})" }
+      logger.info(self.class) { "SPOOL STOP! Going to kill => #{format_processes}" }
 
-      processes.each do |p| 
+      all_processes.each do |p| 
         begin
-          p.send_signal(configuration.kill_signal) if p.alive?
+          send_signal_to(p, configuration.kill_signal) if p.alive?
         rescue Datacenter::Shell::CommandError => e
-          if p.alive?
-            log_error e
-          else
-            logger.info(self.class) { "Signal KILL was sent to #{p.pid} but process was already dead" }
-          end
+          log_error e
         end
       end
 
-      wait_for_stopped processes
+      wait_for_stopped all_processes
       
-      processes.clear
+      working_processes.clear
+      zombie_processes.clear
       
       File.delete configuration.pid_file if File.exist? configuration.pid_file
       @running = false
@@ -167,20 +165,45 @@ module Spool
     def stop_processes(processes_list)
       processes_list.each do |p| 
         begin
-          logger.info(self.class) {"Going to kill process #{p.pid}, alive? => #{p.alive?}"}
-          p.send_signal configuration.stop_signal
+          send_signal_to p, configuration.stop_signal
+          zombie_processes << p
         rescue Exception => e
           log_error e
         end
       end
+
+      working_processes.delete_if{ |p| zombie_processes.include? p }
     end
 
-    def wait_for_stopped(processes)
-      while processes.any?(&:alive?)
+    def wait_for_stopped(processes_list)
+      while processes_list.any?(&:alive?)
         sleep 0.01
       end
     end
 
+    def check_processes_to_restart
+      to_restart = working_processes.select(&configuration.restart_condition)
+
+      if to_restart.any?
+        logger.info(self.class) {"Restart condition successful in child processes: #{to_restart.map(&:pid)}"}
+        stop_processes to_restart
+      end
+    end
+
+    def send_signal_to(process, signal)
+      logger.info(self.class) { "Going to send signal #{signal} to process #{process.pid}" }
+      process.send_signal signal
+    end
+
+    def clear_dead_processes
+      working_processes.delete_if { |p| !p.alive? }
+      zombie_processes.delete_if { |p| !p.alive? }
+    end
+
+    def all_processes_count
+      working_processes.count + zombie_processes.count
+    end
+
     def logger
       configuration.logger
     end
@@ -197,6 +220,10 @@ module Spool
       end.join("\n")
     end
 
+    def format_processes
+      "Working Processes: #{working_processes.map(&:pid)}, Zombie Processes: #{zombie_processes.map(&:pid)}"
+    end
+
   end
 
 end

data/lib/spool/version.rb

@@ -1,3 +1,3 @@
 module Spool
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/spool.rb

@@ -3,6 +3,7 @@ require 'securerandom'
 require 'timeout'
 require 'tmpdir'
 require 'mono_logger'
+require 'set'
 
 require_relative 'spool/version'
 require_relative 'spool/dsl'

data/spec/pool_spec.rb

@@ -18,7 +18,7 @@ describe Spool::Pool do
     @pool = Spool::Pool.new(&block).tap do |pool|
       t = Thread.new { pool.start }
       t.abort_on_exception = true
-      while pool.processes.count < pool.configuration.processes
+      while pool.all_processes.count < pool.configuration.processes
         sleep 0.01
       end
     end
@@ -40,10 +40,10 @@ describe Spool::Pool do
     end
 
     pool.must_be :running?
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
     pool.stop
 
     while pool.running?
@@ -51,7 +51,7 @@ describe Spool::Pool do
     end 
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty
+    pool.all_processes.must_be_empty
     process.wont_be :alive?
   end
 
@@ -62,10 +62,10 @@ describe Spool::Pool do
     end
 
     pool.must_be :running?
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
 
     pool.stop!
 
@@ -74,7 +74,7 @@ describe Spool::Pool do
     end 
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty
+    pool.all_processes.must_be_empty
     process.wont_be :alive?
   end
 
@@ -84,18 +84,18 @@ describe Spool::Pool do
       command 'ruby -e "loop do; sleep 1; end"'
     end
 
-    original_process = pool.processes[0]
+    original_process = pool.all_processes[0]
     original_process.send_signal :KILL
 
     begin
       sleep SLEEP_TIME
-      new_pid = pool.processes.any? ? pool.processes[0].pid : original_process.pid
+      new_pid = pool.all_processes.any? ? pool.all_processes[0].pid : original_process.pid
     end while original_process.pid == new_pid
     
     original_process.wont_be :alive?
 
-    pool.processes.count.must_equal 1
-    pool.processes[0].must_be :alive?
+    pool.all_processes.count.must_equal 1
+    pool.all_processes[0].must_be :alive?
   end
 
   it 'Restart processes' do
@@ -105,18 +105,18 @@ describe Spool::Pool do
       stop_signal :TERM
     end
 
-    pool.processes.count.must_equal 2
+    pool.all_processes.count.must_equal 2
 
-    original_pids = pool.processes.map(&:pid)
+    original_pids = pool.all_processes.map(&:pid)
     
     pool.restart
     
     begin
       sleep SLEEP_TIME
-      new_pids = (pool.processes.count == 2) ? pool.processes.map(&:pid) : original_pids
+      new_pids = (pool.all_processes.count == 2) ? pool.all_processes.map(&:pid) : original_pids
     end until (original_pids & new_pids).empty?
 
-    pool.processes.each { |p| p.must_be :alive?}
+    pool.all_processes.each { |p| p.must_be :alive?}
   end
 
   it 'Stop with timeout' do
@@ -126,7 +126,7 @@ describe Spool::Pool do
       stop_signal :QUIT
     end
 
-    process = pool.processes[0]
+    process = pool.all_processes[0]
 
     Benchmark.realtime do 
       pool.stop 0.1
@@ -136,7 +136,7 @@ describe Spool::Pool do
     end.must_be :<, 1
 
     pool.must_be :stopped?
-    pool.processes.must_be_empty    
+    pool.all_processes.must_be_empty    
     process.wont_be :alive?
   end
 
@@ -146,11 +146,11 @@ describe Spool::Pool do
       command 'ruby -e "loop do; sleep 1; end"'
     end
 
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
 
     pool.incr 2
 
-    assert_with_timeout(1) { pool.processes.count == 3 }
+    assert_with_timeout(1) { pool.all_processes.count == 3 }
   end
 
   it 'Decrease processes' do
@@ -160,11 +160,11 @@ describe Spool::Pool do
       stop_signal :TERM
     end
 
-    pool.processes.count.must_equal 3
+    pool.all_processes.count.must_equal 3
 
     pool.decr 2
 
-    assert_with_timeout(1) { pool.processes.count == 1 }
+    assert_with_timeout(1) { pool.all_processes.count == 1 }
   end
 
   it 'Change process when satisfied stop condition' do
@@ -187,18 +187,18 @@ describe Spool::Pool do
       stop_signal :TERM
     end
 
-    original_process = pool.processes[0]
+    original_process = pool.all_processes[0]
 
     begin
       sleep SLEEP_TIME
-      new_pid = pool.processes.any? ? pool.processes[0].pid : original_process.pid
+      new_pid = pool.all_processes.any? ? pool.all_processes[0].pid : original_process.pid
     end while original_process.pid == new_pid
 
     text_file = File.read(file_name)
     File.delete(file_name) 
 
     text_file.must_equal 'Finished'
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
   end
 
   it 'Reload config' do
@@ -208,19 +208,19 @@ describe Spool::Pool do
     pool = Spool::Pool.new(config).tap do |pool|
       t = Thread.new { pool.start }
       t.abort_on_exception = true
-      while pool.processes.count < pool.configuration.processes
+      while pool.all_processes.count < pool.configuration.processes
       end
     end
 
-    pool.processes.count.must_equal 1
+    pool.all_processes.count.must_equal 1
 
     pool.incr 1
 
-    assert_with_timeout(1) { pool.processes.count == 2 }
+    assert_with_timeout(1) { pool.all_processes.count == 2 }
     
     pool.reload
 
-    assert_with_timeout(1) { pool.processes.count == 1 }
+    assert_with_timeout(1) { pool.all_processes.count == 1 }
 
     pool.stop!
   end

metadata

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