spool 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd69246ea37212c4be4790fffcf8605c16f31e2b
-  data.tar.gz: 556ff1e0891bd8e83407f837a522f1aa6bd770cc
+  metadata.gz: 0548f5c405ead7e5fa0f5b61fe9d715b289385c3
+  data.tar.gz: ae94274bf5d724f65ba0128d9e1ecbe68e306de9
 SHA512:
-  metadata.gz: c7e8b6b9799b61d376564d6f97edd784477acbb0fc66fffdc916771788f7b7f34659d22ed676ed27954b687a873d829df5647483bae3cfb19bd739abafcb8012
-  data.tar.gz: bbdb9307edea81364ca9eb6732f09686ef8a676273dffc25f38532867a3d58266874ac72c035568fe3322a43e499029d00560d89c73c53afd9662dedd6255193
+  metadata.gz: 1c7b0bec7c5d9aa71f97a3026819df40d0e7bb809c903388bc1d3ccca9361f25b86b48fdf3955590eb0b755d27fd73adeaae5771511af223c64c9b7c5b70712e
+  data.tar.gz: 2c4f1770e103ae67b8e2ad504d1a573054937f7310e58fce96834bd2cc769f37ba4853fa735ef79373e8e5f4767f84d3c8f41a6fb3bf00528004e16b658f6f30

data/.ruby-version

@@ -1 +1 @@
-ruby 2.1
+ruby 2.0

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0
-  - 2.1
+  - 2.1
+  - 2.2

data/bin/spool

@@ -8,6 +8,7 @@ end
 pid = fork do
   require File.expand_path('../lib/spool', File.dirname(__FILE__))
   config = Spool::DSL.configure ARGV.first
+  $PROGRAM_NAME = "ruby spool #{config.name}"
   Spool::Pool.new(config).start
 end
 

data/lib/spool/configuration.rb

@@ -1,13 +1,23 @@
 module Spool
   class Configuration
   
-    attr_accessor :processes, 
+    attr_accessor :name,
+                  :processes, 
                   :env,
                   :dir, 
                   :command, 
-                  :pidfile, 
+                  :pid_file, 
                   :restart_condition,
-                  :source_file
+                  :source_file,
+                  :stop_signal, 
+                  :kill_signal,
+                  :log_file,
+                  :log_level,
+                  :log_formatter
+                  
+    def name
+      @name ||= 'SPOOL'
+    end
 
     def env
       @env ||= {}
@@ -17,8 +27,44 @@ module Spool
       @dir ||= source_file ? File.dirname(source_file) : Dir.pwd
     end
 
-    def pidfile
-      @pidfile ||= File.join(dir, (source_file ? "#{File.basename(source_file, '.*')}.pid" : 'pool.pid'))
+    def pid_file
+      @pid_file ||= File.join(dir, (source_file ? "#{File.basename(source_file, '.*')}.pid" : 'pool.pid'))
+    end
+
+    def restart_condition
+      @restart_condition ||= Proc.new do |p|
+        false
+      end
+    end
+
+    def stop_signal
+      @stop_signal ||= :QUIT
+    end
+
+    def kill_signal
+      @kill_signal ||= :KILL
+    end
+
+    def log_file
+      @log_file ||= '/dev/null'
+    end
+
+    def log_formatter
+      @log_formatter ||= Proc.new do |s,d,p,m|
+        "#{d} - #{name} - #{s.to_s.ljust(5,' ')} - #{p.to_s.upcase} ##{::Process.pid} - #{m}\n"
+      end
+    end
+
+    def log_level
+      @log_level ||= 'INFO'
+    end
+
+    def logger
+      @logger ||= MonoLogger.new(log_file).tap do |logger|
+        logger.level = MonoLogger.const_get log_level
+        logger.formatter = log_formatter
+        Datacenter.logger = logger
+      end
     end
 
   end

data/lib/spool/dsl.rb

@@ -20,6 +20,10 @@ module Spool
       end
     end
 
+    def name(name)
+      configuration.name = name
+    end
+
     def processes(count)
       configuration.processes = count
     end
@@ -36,13 +40,33 @@ module Spool
       configuration.command = command
     end
 
-    def pidfile(pidfile)
-      configuration.pidfile = pidfile
+    def pid_file(pid_file)
+      configuration.pid_file = pid_file
     end
 
     def restart_when(&block)
       configuration.restart_condition = block
     end
 
+    def stop_signal(signal)
+      configuration.stop_signal = signal.to_sym
+    end
+
+    def kill_signal(signal)
+      configuration.kill_signal = signal.to_sym
+    end
+
+    def log_file(filename)
+      configuration.log_file = filename
+    end
+
+    def log_level(level)
+      configuration.log_level = level.to_s.upcase
+    end
+
+    def log_formatter(&block)
+      configuration.log_formatter = block
+    end
+
   end
 end

data/lib/spool/pool.rb

@@ -32,11 +32,12 @@ module Spool
 
       handle_signals
 
-      File.write configuration.pidfile, Process.pid if configuration.pidfile
+      File.write configuration.pid_file, Process.pid if configuration.pid_file
 
       configuration.processes.times.map do
         processes << Spawner.spawn(configuration)
       end
+      logger.info(self.class) { "SPOOL START childrens: #{processes.map(&:pid)}" }
 
       while @started
         check_status
@@ -45,18 +46,22 @@ module Spool
     end
 
     def stop(timeout=0)
-      processes.each(&:stop)
+      logger.info(self.class) { "SPOOL STOP" }
+      stop_processes processes
       Timeout.timeout(timeout) { wait_for_stopped processes }
     rescue Timeout::Error
+      logger.error(self.class) { "ERROR IN SPOOL STOP. Timeout error" }
     ensure
       stop!
     end
 
     def stop!
-      processes.each(&:kill)
-      processes.clear
-      File.delete configuration.pidfile if File.exists? configuration.pidfile
       @started = false
+      logger.info(self.class) { "SPOOL STOP! kill this children (#{processes.map(&:pid)})" }
+      processes.each { |p| p.send_signal configuration.kill_signal}
+      wait_for_stopped processes
+      processes.clear
+      File.delete configuration.pid_file if File.exists? configuration.pid_file
     end
 
     def incr(count=1)
@@ -72,7 +77,8 @@ module Spool
     end
 
     def restart
-      processes.each(&:stop)
+      logger.info(self.class) { "RESTART" }
+      stop_processes processes
     end
 
     private
@@ -86,32 +92,48 @@ module Spool
     def check_status 
       return if stopped?
 
-      processes.select(&configuration.restart_condition).each(&:stop) if configuration.restart_condition
+      stop_processes processes.select(&configuration.restart_condition)
       processes.delete_if { |p| !p.alive? }
 
+      return if stopped?
       if configuration.processes > processes.count
+        logger.info(self.class) { "Initialize new children: #{processes.map(&:pid)}" }
+
         (configuration.processes - processes.count).times do
           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)}" }
+
         list = processes.take(processes.count - configuration.processes)
-        list.each(&:stop)
+        stop_processes list
         wait_for_stopped list
         list.each { |p| processes.delete p }
 
+        logger.info(self.class) { "After kill childrens: #{processes.map(&:pid)}" }
       end
 
     rescue
       retry
     end
 
+    def stop_processes(processes_list)
+      processes_list.each { |p| p.send_signal configuration.stop_signal }
+    end
+
     def wait_for_stopped(processes)
       while processes.any?(&:alive?)
         sleep 0.01
       end
     end
 
+    def logger
+      configuration.logger
+    end
+
   end
 
 end

data/lib/spool/version.rb

@@ -1,3 +1,3 @@
 module Spool
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 end

data/lib/spool.rb

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

data/spec/dsl_spec.rb

@@ -6,12 +6,18 @@ describe Spool::DSL do
   
   it 'Configure from block' do
     config = Spool::DSL.configure do
+      name 'Process pool'
       processes 10
       env VAR_1: 1, VAR_2: 2
       dir '/tmp'
       command 'tailf file.log'
-      pidfile '/tailf.pid'
+      pid_file '/tailf.pid'
       restart_when { |p| p.memory > 512 }
+      stop_signal :TERM
+      kill_signal :INT
+      log_file 'test.log'
+      log_level :INFO
+      log_formatter { |s,d,p,m| "#{s},#{d},#{p},#{m}" }
     end
 
     assert_configuration config
@@ -26,12 +32,18 @@ describe Spool::DSL do
   end
 
   def assert_configuration(config)
+    config.name.must_equal 'Process pool'
     config.processes.must_equal 10
     config.env.must_equal VAR_1: 1, VAR_2: 2
     config.dir.must_equal '/tmp'
     config.command.must_equal 'tailf file.log'
     config.restart_condition.call(MockProcess.new(600)).must_equal true
     config.restart_condition.call(MockProcess.new(100)).must_equal false
+    config.stop_signal.must_equal :TERM
+    config.kill_signal.must_equal :INT
+    config.log_file.must_equal 'test.log'
+    config.log_level.must_equal 'INFO'
+    config.log_formatter.call('1','2','3','4').must_equal '1,2,3,4'
   end
 
 end

data/spec/loop_pool_config.rb

@@ -0,0 +1,4 @@
+name 'SPOOL_TEST'
+processes 1
+command 'ruby -e "loop do; sleep 1; end"'
+stop_signal :TERM

data/spec/pool_spec.rb

@@ -5,7 +5,7 @@ describe Spool::Pool do
   after do
     @pool.stop! if @pool
     machine = Datacenter::Machine.new
-    machine.processes('ruby -e').each(&:kill)
+    machine.processes('ruby -e').each {|p| p.send_signal :KILL}
   end
 
   def start_pool(&block)
@@ -29,6 +29,7 @@ describe Spool::Pool do
     pool = start_pool do
       processes 1
       command 'ruby -e "loop do; sleep 1; end"'
+      stop_signal :TERM
     end
 
     pool.must_be :started?
@@ -44,6 +45,25 @@ describe Spool::Pool do
     process.wont_be :alive?
   end
 
+  it 'Start and force stop' do
+    pool = start_pool do
+      processes 1
+      command 'ruby -e "loop do; sleep 1; end"'
+    end
+
+    pool.must_be :started?
+    pool.processes.count.must_equal 1
+    pool.processes[0].must_be :alive?
+
+    process = pool.processes[0]
+
+    pool.stop!
+
+    pool.must_be :stopped?
+    pool.processes.must_be_empty
+    process.wont_be :alive?
+  end
+
   it 'Recover killed process' do
     pool = start_pool do
       processes 1
@@ -51,7 +71,7 @@ describe Spool::Pool do
     end
 
     original_process = pool.processes[0]
-    original_process.kill
+    original_process.send_signal :KILL
 
     original_process.wont_be :alive?
 
@@ -61,10 +81,30 @@ describe Spool::Pool do
     pool.processes[0].must_be :alive?
   end
 
+  it 'Restart processes' do
+    pool = start_pool do
+      processes 2
+      command 'ruby -e "loop do; sleep 1; end"'
+      stop_signal :TERM
+    end
+
+    pool.processes.count.must_equal 2
+
+    original_pids = pool.processes.map(&:pid)
+    
+    pool.restart
+
+    until pool.processes.count == 2 && pool.processes[0].pid != original_pids[0] && pool.processes[1].pid != original_pids[1]; end
+
+    pool.processes.count.must_equal 2
+    pool.processes.each { |p| p.must_be :alive?}
+  end
+
   it 'Stop with timeout' do
     pool = start_pool do
       processes 1
-      command 'ruby -e "Signal.trap(:TERM) { sleep 5; exit 0 }; loop { sleep 1 }"'
+      command 'ruby -e "Signal.trap(:QUIT) { puts :quit; sleep 5; exit 0 }; loop { sleep 1 }"'
+      stop_signal :QUIT
     end
 
     process = pool.processes[0]
@@ -93,6 +133,7 @@ describe Spool::Pool do
     pool = start_pool do
       processes 3
       command 'ruby -e "loop do; sleep 1; end"'
+      stop_signal :TERM
     end
 
     pool.processes.count.must_equal 3
@@ -103,21 +144,52 @@ describe Spool::Pool do
   end
 
   it 'Change process when satisfied stop condition' do
+    file_name = File.expand_path 'used_memory.log'
+    ruby_command = "require 'datacenter'; Signal.trap(:TERM) { File.write('#{file_name}', Datacenter::Process.new(Process.pid).memory); exit 0 }; a = 50_000_000.times.to_a; loop do; end"
+
     pool = start_pool do
       processes 1
-      command 'ruby -e "a = 50_000_000.times.to_a; loop do; end"'
+      command "ruby -e \"#{ruby_command}\""
       restart_when { |p| p.memory > 300 }
+      stop_signal :TERM
     end
 
     memory = 0
     process = pool.processes[0]
-    while pool.processes.empty? || pool.processes[0].pid == process.pid
-      memory = process.memory
+    while !File.exists?(file_name)
+      sleep 0.5  
     end
 
-    memory.must_be :>, 100
+    memory = File.read(file_name).to_i
+    File.delete(file_name) 
+
+    memory.must_be :>=, 300
     pool.processes.count.must_equal 1
     pool.processes[0].pid.wont_equal process.pid
   end
 
+  it 'Reload config' do
+    config_file = File.expand_path('../loop_pool_config.rb', __FILE__)
+    config = Spool::DSL.configure config_file
+
+    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
+      end
+    end
+
+    pool.processes.count.must_equal 1
+
+    pool.incr 1
+
+    assert_with_timeout(1) { pool.processes.count == 2 }
+    
+    pool.reload
+
+    assert_with_timeout(1) { pool.processes.count == 1 }
+
+    pool.stop!
+  end
+
 end

data/spec/sample_config.rb

@@ -1,6 +1,12 @@
+name 'Process pool'
 processes 10
 env VAR_1: 1, VAR_2: 2
 dir '/tmp'
 command 'tailf file.log'
-pidfile '/tailf.pid'
+pid_file '/tailf.pid'
 restart_when { |p| p.memory > 512 }
+stop_signal 'TERM'
+kill_signal 'INT'
+log_file 'test.log'
+log_level 'INFO'
+log_formatter { |s,d,p,m| "#{s},#{d},#{p},#{m}" }

data/spool.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'datacenter', '~> 0.1.0'
+  spec.add_dependency 'datacenter', '~> 0.2.0'
+  spec.add_dependency 'mono_logger'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: spool
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datacenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: mono_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -116,11 +130,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -134,6 +148,7 @@ files:
 - lib/spool/version.rb
 - spec/coverage_helper.rb
 - spec/dsl_spec.rb
+- spec/loop_pool_config.rb
 - spec/minitest_helper.rb
 - spec/pool_spec.rb
 - spec/sample_config.rb
@@ -149,12 +164,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -166,6 +181,7 @@ summary: Manage and keep alive pool of processes
 test_files:
 - spec/coverage_helper.rb
 - spec/dsl_spec.rb
+- spec/loop_pool_config.rb
 - spec/minitest_helper.rb
 - spec/pool_spec.rb
 - spec/sample_config.rb