daemonizer 0.0.4 → 0.0.6

data/README

@@ -34,15 +34,11 @@ pool :daemonizer do
 end
 
 pool :new_daemonizer do
+  workers 4
+  poll_period 5
+  log_file "log/daemonizer.log" #relative to Demfile
 
-  before_init do |logger, block|
-    logger.info "New: Preparing master process"
-    block.call
-  end
+  handler ::AsyncObserver::DaemonizerHandler
   
-  after_init do |logger, worker_id, workers_count|
-    logger.info "Started #{worker_id}/#{workers_count}"
-    sleep 1
-    logger.info "Stopped #{worker_id}/#{workers_count}"
-  end
+  set_option :queue, lambda { |worker_id, worker_count| "queue_#{worker_id}"}
 end

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/daemonizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.0.4"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-06}
+  s.date = %q{2010-07-08}
   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}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/daemonizer/dsl.rb",
      "lib/daemonizer/engine.rb",
      "lib/daemonizer/errors.rb",
+     "lib/daemonizer/handler.rb",
      "lib/daemonizer/process_manager.rb",
      "lib/daemonizer/worker.rb",
      "lib/daemonizer/worker_pool.rb"

data/lib/daemonizer/autoload.rb

@@ -11,6 +11,8 @@ module Daemonizer
   autoload :Worker,         __p('worker')
   autoload :WorkerPool,     __p('worker_pool')
   autoload :ProcessManager, __p('process_manager')
+  autoload :Handler,        __p('handler')
+  autoload :FakeHandler,    __p('handler')
 
   include Errors
 end

data/lib/daemonizer/cli.rb

@@ -66,12 +66,14 @@ module Daemonizer
     end
 
     desc "restart", "Restart pool"
+    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def restart(pool_name = nil)
       invoke :stop, pool_name
       invoke :start, pool_name
     end
 
     desc "debug", "Debug pool (do not demonize)"
+    method_option :demfile, :type => :string, :aliases => "-D", :banner => "Path to Demfile"
     def debug(pool_name = nil)
       puts "You should supply pool_name to debug" if pool_name.nil?
       control_pools_loop(pool_name, "execution ended", options[:demfile]) do |pool|
@@ -84,7 +86,8 @@ module Daemonizer
         print_pool pool.name,  " Done!"
         exit(0)
       end
-      return true    end
+      return true    
+    end
     
   private
     def control_pools_loop(pool_name, message = nil, demfile = nil, &block)
@@ -110,7 +113,7 @@ module Daemonizer
         if pool = pools[pool_name.to_sym]
           [pool]
         else
-          print_pool pool_name,  "Pool with name `#{pool_name}` is not configured"
+          print_pool pool_name,  "pool is not configured"
           []
         end
       else

data/lib/daemonizer/config.rb

@@ -2,7 +2,7 @@ module Daemonizer
   class Config
     class ConfigError < StandardError;  end
 
-    attr_reader :pool
+    attr_reader :pool, :handler
 
     def initialize(pool, options)
       @pool = pool
@@ -10,6 +10,17 @@ module Daemonizer
       init_defaults
       init_logger
       validate
+      initialize_handler
+    end
+    
+    def initialize_handler
+      if @options[:after_init]
+        @handler = FakeHandler.new(@options[:before_init], @options[:after_init], @options)
+        @options[:after_init] = @options[:before_init] = nil
+      elsif
+        @handler = @options[:handler].new(@options[:handler_options])
+      end
+      @handler.logger = @logger
     end
     
     def init_logger
@@ -22,30 +33,49 @@ module Daemonizer
     end
     
     def init_defaults
-      @options[:before_init] ||= Proc.new
+      @options[:before_init] ||= nil
+      @options[:after_init] ||= nil
       @options[:engine] ||= :fork
       @options[:workers] ||= 1
       @options[:log_file] ||= "log/#{@pool}.log"
       @options[:poll_period] ||= 5
       @options[:pid_file] ||= "pid/#{@pool}.pid"
+      @options[:handler] ||= nil
+      @options[:handler_options] ||= {}
     end
     
     def validate
-      Daemonizer.report_fatal_error "Workers count should be more then zero", @logger if @options[:workers] < 1
-      Daemonizer.report_fatal_error "Engine #{@options[:engine]} is not known", @logger unless [:fork, :thread].include?(@options[:engine])
-      if @options[:before_init]
-        Daemonizer.report_fatal_error "before_init should have block", @logger unless @options[:before_init].is_a?(Proc)
+      raise ConfigError, "Workers count should be more then zero" if @options[:workers] < 1
+      raise ConfigError, "Engine #{@options[:engine]} is not known" unless [:fork, :thread].include?(@options[:engine])
+
+      raise ConfigError, "Poll period should be more then zero" if @options[:poll_period] < 1
+      if @options[:handler]
+        raise ConfigError, "Handler should be a class" unless @options[:handler].is_a?(Class)
+        raise ConfigError, "Handler should respond to :after_init" unless @options[:handler].public_instance_methods.include?('after_init')
+        raise ConfigError, "Handler set. Don't use :after_init and :before init in Demfile" if @options[:before_init] || @options[:after_init]
+      else
+        raise ConfigError, "set_option can be used only with handler" if @options[:handler_options].any?
+        if @options[:before_init]
+          raise ConfigError, "before_init should have block" unless @options[:before_init].is_a?(Proc)
+        end
+        raise ConfigError, "after_init should be set" if @options[:after_init].nil?
+        raise ConfigError, "after_init should have block" unless @options[:after_init].is_a?(Proc)
       end
-      Daemonizer.report_fatal_error "after_init should be set", @logger if @options[:after_init].nil?
-      Daemonizer.report_fatal_error "after_init should have block", @logger unless @options[:after_init].is_a?(Proc)
-      Daemonizer.report_fatal_error "Poll period should be more then zero", @logger if @options[:poll_period] < 1
     end
     
-    [:before_init, :engine, :workers, :after_init, :poll_period, :root].each do |method|
+    [:engine, :workers, :poll_period, :root].each do |method|
       define_method method do
         @options[method.to_sym]
       end
     end
+     
+    def before_init
+      @handler.method(:before_init)
+    end
+
+    def after_init
+      @handler.method(:after_init)
+    end
         
     [:log_file, :pid_file].each do |method|
       define_method method do

data/lib/daemonizer/daemonize.rb

@@ -48,9 +48,13 @@ module Daemonizer
 
       fork && exit # Fork and exit from the parent
 
+      STDIN.reopen '/dev/null'
+      STDOUT.reopen '/dev/null', 'a'
+      STDERR.reopen STDOUT
+      
       # Detach from the controlling terminal
       unless sess_id = Process.setsid
-        raise Daemons.RuntimeException.new('cannot detach from controlling terminal')
+        raise 'cannot detach from controlling terminal'
       end
 
       # Prevent the possibility of acquiring a controlling terminal

data/lib/daemonizer/dsl.rb

@@ -14,6 +14,15 @@ module Daemonizer
       @pool     = :default
       @configs  = {}
     end
+    
+    def set_option(option, value)
+      @options[:handler_options] ||= {}
+      @options[:handler_options][option.to_sym] = value
+    end
+    
+    def handler(handler)
+      @options[:handler] = handler
+    end
         
     def poll_period(seconds)
       @options[:poll_period] = seconds.to_i

data/lib/daemonizer/engine.rb

@@ -16,17 +16,20 @@ module Daemonizer
       init_block = Proc.new do
         begin
           @pm.start_workers do |process_id| 
-            @config.after_init.call(logger, process_id, @config.workers)
+            @config.handler.worker_id = process_id
+            @config.handler.workers_count = @config.workers
+            @config.handler.after_init
           end
         rescue Exception => e
-          logger.fatal e.to_s
+          log_error(e)
         end
       end
 
       begin
-        @config.before_init.call(@config.logger, init_block)
+        @config.handler.logger = logger        
+        @config.handler.before_init(init_block)
       rescue Exception => e
-        logger.fatal e.to_s
+        log_error(e)
       end
       # Start monitoring loop
       
@@ -35,22 +38,32 @@ module Daemonizer
     end
 
     def debug!
-      logger.outputters = Outputter.stdout
+      outputter = Outputter.stdout
+      outputter.formatter = PatternFormatter.new :pattern => "%d - %l %g - %m"
+      logger.outputters = outputter
 
       init_block = Proc.new do
         begin
-          @config.after_init.call(logger, 1, 1)
+          @config.handler.worker_id = 1
+          @config.handler.workers_count = 1
+          @config.handler.after_init
         rescue Exception => e
-          logger.fatal e.to_s
+          log_error(e)
         end
       end
 
       begin
-        @config.before_init.call(@config.logger, init_block)
+        @config.handler.logger = logger        
+        @config.handler.before_init(init_block)
       rescue Exception => e
-        logger.fatal e.to_s
+        log_error(e)
       end
     end
+    
+    def log_error(e)
+      logger.fatal e.to_s
+      logger.fatal "#{e.class}: #{e}\n" + e.backtrace.join("\n")
+    end
 
     private
       def setup_signals

data/lib/daemonizer/handler.rb

@@ -0,0 +1,43 @@
+module Daemonizer
+  class Handler
+    attr_accessor :worker_id
+    attr_accessor :workers_count
+    attr_accessor :logger
+    
+    def initialize(options = {})
+      @options = options
+    end
+    
+    def before_init(block)
+      block.call
+    end
+    
+    def option(key)
+      if option = @options[key.to_sym] and option.is_a?(Proc)
+        option.call(@worker_id, @workers_count)
+      else
+        option
+      end
+    end
+  end
+  
+  class FakeHandler < Handler
+    def initialize(before_init, after_init, options = {})
+      @before_init = before_init
+      @after_init = after_init
+      super(options)
+    end
+    
+    def before_init(block)
+      if @before_init
+        @before_init.call(@logger, block)
+      else
+        super
+      end
+    end
+        
+    def after_init
+      @after_init.call(@logger, @worker_id, @workers_count)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-06 00:00:00 +04:00
+date: 2010-07-08 00:00:00 +04:00
 default_executable: daemonizer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - lib/daemonizer/dsl.rb
 - lib/daemonizer/engine.rb
 - lib/daemonizer/errors.rb
+- lib/daemonizer/handler.rb
 - lib/daemonizer/process_manager.rb
 - lib/daemonizer/worker.rb
 - lib/daemonizer/worker_pool.rb