daemonizer 0.4.12 → 0.4.13

data/Rakefile

@@ -11,22 +11,36 @@ begin
     gemspec.homepage = "http://github.com/glebpom/daemonizer"
     gemspec.authors = ["Gleb Pomykalov"]
     gemspec.add_dependency('thor', '>= 0.13.7')
+    gemspec.add_dependency('simple-statistics', '>= 0')
+    gemspec.add_development_dependency "rspec", ">= 1.2.9"
+    gemspec.add_development_dependency "yard", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
 
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
 begin
   require 'yard'
-  YARD::Rake::YardocTask.new(:yard) do |t|
-    t.options = ['--title', 'Daemonizer Documentation']
-    if ENV['PRIVATE']
-      t.options.concat ['--protected', '--private']
-    else
-      t.options.concat ['--protected', '--no-private']
-    end
-  end
+  YARD::Rake::YardocTask.new
 rescue LoadError
-  puts 'Yard not available. Install it with: sudo gem install yard'
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+  end
 end

data/VERSION

@@ -1 +1 @@
-0.4.12
+0.4.13

data/daemonizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.4.12"
+  s.version = "0.4.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-29}
+  s.date = %q{2010-08-04}
   s.default_executable = %q{daemonizer}
   s.description = %q{Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops}
   s.email = %q{glebpom@gmail.com}
@@ -39,13 +39,20 @@ Gem::Specification.new do |s|
      "lib/daemonizer/process_manager.rb",
      "lib/daemonizer/stats.rb",
      "lib/daemonizer/worker.rb",
-     "lib/daemonizer/worker_pool.rb"
+     "lib/daemonizer/worker_pool.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/test_spec.rb"
   ]
   s.homepage = %q{http://github.com/glebpom/daemonizer}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/test_spec.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -53,11 +60,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thor>, [">= 0.13.7"])
+      s.add_runtime_dependency(%q<simple-statistics>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<thor>, [">= 0.13.7"])
+      s.add_dependency(%q<simple-statistics>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.13.7"])
+    s.add_dependency(%q<simple-statistics>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0"])
   end
 end
 

data/lib/daemonizer.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'erb'
 require 'pathname'
 require 'logger'
+require 'simple-statistics'
 
 module Daemonizer
   

data/lib/daemonizer/cli.rb

@@ -85,7 +85,10 @@ module Daemonizer
 
     desc "debug", "Debug pool (do not demonize)"
     def debug(pool_name = nil)
-      puts "You should supply pool_name to debug" if pool_name.nil?
+      if pool_name.nil?
+        puts "You should supply pool_name to debug"
+        exit 1
+      end 
       control_pools_loop(pool_name, "execution ended", true) do |pool|        
         STDOUT.sync = true
         

data/lib/daemonizer/config.rb

@@ -32,6 +32,7 @@ module Daemonizer
       @options[:handler] ||= nil
       @options[:handler_options] ||= {}
       @options[:callbacks] ||= {}
+      @options[:on_poll] ||= []
       @options[:cow_friendly] = true if @options[:cow_friendly].nil?
     end
     
@@ -70,7 +71,7 @@ module Daemonizer
       validate_file(self.pid_file)
     end
 
-    [:workers, :poll_period, :root, :cow_friendly, :callbacks, :handler_options].each do |method|
+    [:workers, :poll_period, :root, :cow_friendly, :callbacks, :handler_options, :on_poll].each do |method|
       define_method method do
         @options[method.to_sym]
       end

data/lib/daemonizer/dsl.rb

@@ -39,6 +39,12 @@ class Daemonizer::Dsl
     end
   end
 
+  def on_poll(&block)
+    @options[:on_poll] ||= []
+    @options[:on_poll] << block
+  end
+
+
   def not_cow_friendly
     @options[:cow_friendly] = false
   end
@@ -94,6 +100,7 @@ class Daemonizer::Dsl
     options = @options.dup
     options[:handler_options] = @options[:handler_options].dup if @options[:handler_options]
     options[:callbacks] = @options[:callbacks].dup if @options[:callbacks]
+    options[:on_poll] = @options[:on_poll].dup if @options[:on_poll]
     options
   end
 end

data/lib/daemonizer/handler.rb

@@ -32,11 +32,8 @@ module Daemonizer
     end
     
     def prepare(starter, &block)
-      if @prepare
-        @prepare.call(block)
-      else
-        super
-      end
+      @prepare.call(block) if @prepare
+      super
     end
         
     def start

data/lib/daemonizer/process_manager.rb

@@ -1,7 +1,6 @@
 module Daemonizer
   class ProcessManager
     def initialize(config)
-      @worker_pools = {}
       @shutdown = false
       @config = config
     end
@@ -10,8 +9,8 @@ module Daemonizer
     def start_workers(&blk)
       raise ArgumentError, "Need a worker block!" unless block_given?
       Daemonizer.logger.info "starting all workers"
-      @worker_pools[@config.pool] = WorkerPool.new(@config.pool, self, &blk)
-      @worker_pools[@config.pool].start_workers(@config.workers)
+      @pool = WorkerPool.new(@config.pool, self, &blk)
+      @pool.start_workers(@config.workers)
     end
 
     def monitor_workers
@@ -20,15 +19,20 @@ module Daemonizer
       Daemonizer.logger.debug 'Starting workers monitoring code...'
       loop do
         Daemonizer.logger.debug "Checking workers' health..."
-        @worker_pools.each do |name, pool|
-          break if shutdown?
-          pool.check_workers
+        break if shutdown?
+        @pool.check_workers
+        
+        @config.on_poll.each do |on_poll|
+          on_poll.call(@pool)
         end
 
         break if shutdown?
         Daemonizer.logger.debug "Sleeping for #{@config.poll_period} seconds..." 
         sleep(@config.poll_period)
       end
+    rescue Exception => e
+      Daemonizer.logger.fatal "Monitor error: #{e.to_s}\n  #{e.backtrace.join("\n  ")}"
+      raise
     ensure
       Daemonizer.logger.debug "Workers monitoring loop is finished, starting shutdown..."
       # Send out stop signals
@@ -51,11 +55,7 @@ module Daemonizer
     def wait_for_workers(seconds)
       seconds.times do
         Daemonizer.logger.debug "Shutting down... waiting for workers to die (we have #{seconds} seconds)..."
-        running_total = 0
-
-        @worker_pools.each do |name, pool|
-          running_total += pool.wait_workers
-        end
+        running_total = @pool.wait_workers
 
         if running_total.zero?
           Daemonizer.logger.debug "All workers are dead. Exiting..."
@@ -69,14 +69,12 @@ module Daemonizer
       return false
     end
 
-    def stop_workers(force = false)
+    def stop_workers(force = false)      
       # Set shutdown flag
       Daemonizer.logger.debug "Stopping workers#{force ? ' (forced)' : ''}..."
 
       # Termination loop
-      @worker_pools.each do |name, pool|
-        pool.stop_workers(force)
-      end
+      @pool.stop_workers(force)
     end
 
     def shutdown?

data/lib/daemonizer/stats.rb

@@ -180,6 +180,7 @@ module Daemonizer::Stats
   	#  
   	#  # Search by process name.
   	#  list_processes(:match => 'Passenger FrameworkSpawner')
+  	  	
   	def list_processes(options)
   		if options[:exe]
   			name = options[:exe].sub(/.*\/(.*)/, '\1')

data/lib/daemonizer/worker.rb

@@ -1,6 +1,7 @@
 module Daemonizer
   class Worker
     attr_reader :name
+    attr_reader :process_name
     attr_reader :pid
 
     def initialize(name, pm, worker_id, &blk)
@@ -10,6 +11,7 @@ module Daemonizer
       @pm = pm
       @worker_block = blk
       @worker_id = worker_id
+      @process_name = "#{@name} worker: instance #{@worker_id}"
     end
 
     def shutdown?
@@ -34,7 +36,7 @@ module Daemonizer
         Daemonizer.logger.info "Log file reopened after fork"
         normal_exit = false
         begin
-          $0 = "#{@name} worker: instance #{@worker_id}\0"
+          $0 = "#{@process_name}\0"
           @worker_block.call(@worker_id)
           normal_exit = true
           exit(0)

data/lib/daemonizer/worker_pool.rb

@@ -1,12 +1,22 @@
 module Daemonizer
   class WorkerPool
+    MONITOR_VALUE = [:vm_size, :private_dirty_rss, :rss]
+    
     attr_reader :name
+    attr_reader :stats
 
     def initialize(name, pm, &blk)
       @name = name
       @pm = pm
       @worker_block = blk
       @workers = []
+      @stats = ::SimpleStatistics::DataSet.new
+    end
+    
+    def find_worker_by_name(name)
+      @workers.detect do |w|
+        w.process_name.to_s == name.to_s
+      end
     end
 
     def shutdown?
@@ -16,19 +26,39 @@ module Daemonizer
     def start_workers(number)
       Daemonizer.logger.debug "Creating #{number} workers for #{name} pool..."
       number.times do |i|
-        @workers << Worker.new(name, @pm, i+1, &@worker_block)
+        worker = Worker.new(name, @pm, i+1, &@worker_block)
+        @workers << worker
+        @stats.add_data(worker.process_name)
+        Daemonizer.logger.info "Gathering data for #{worker.name}"    
       end
+    rescue Exception => e
+      Daemonizer.logger.info "Result - #{e.inspect}"
     end
 
     def check_workers
       Daemonizer.logger.debug "Checking loop #{name} workers..."
+
+      Daemonizer::Stats::MemoryStats.new(self).find_workers.each do |p|
+        worker_name = p.name
+        MONITOR_VALUE.each do |value|
+          @stats.tick(value)
+          @stats[worker_name][value].add_probe(p.send(value))
+        end
+      end
+      
       @workers.each do |worker|
-        next if worker.running? || worker.shutdown?
-        Daemonizer.logger.warn "Worker #{worker.name} is not running. Restart!"
-        worker.run
+        unless worker.running? || worker.shutdown?
+          Daemonizer.logger.warn "Worker #{worker.name} is not running. Restart!"
+          @stats.add_data(worker.process_name)
+          MONITOR_VALUE.each do |v|
+            @stats[worker.process_name].reset(v)
+          end
+          worker.run
+        end
       end
     end
 
+
     def wait_workers
       running = 0
       @workers.each do |worker|

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'test'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end

data/spec/test_spec.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Configuration" do
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 4
-  - 12
-  version: 0.4.12
+  - 13
+  version: 0.4.13
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +04:00
+date: 2010-08-04 00:00:00 +04:00
 default_executable: daemonizer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,50 @@ dependencies:
         version: 0.13.7
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: simple-statistics
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops
 email: glebpom@gmail.com
 executables: 
@@ -65,6 +109,9 @@ files:
 - lib/daemonizer/stats.rb
 - lib/daemonizer/worker.rb
 - lib/daemonizer/worker_pool.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/test_spec.rb
 has_rdoc: true
 homepage: http://github.com/glebpom/daemonizer
 licenses: []
@@ -99,5 +146,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb
+- spec/test_spec.rb