daemonizer 0.3.10 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.4.0

data/daemonizer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.3.10"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]

data/lib/daemonizer/config.rb

@@ -10,11 +10,12 @@ module Daemonizer
       init_defaults
       validate
       initialize_handler
+      @handler
     end
 
     def initialize_handler
       if @options[:start]
-        @handler = FakeHandler.new(@options[:prepare], @options[:start], @options)
+        @handler = FakeHandler.new(@options[:prepare], @options[:start], @options[:handler_options])
         @options[:start] = @options[:prepare] = nil
       elsif
         @handler = @options[:handler].new(@options[:handler_options])
@@ -30,8 +31,26 @@ module Daemonizer
       @options[:pid_file] ||= "pid/#{@pool}.pid"
       @options[:handler] ||= nil
       @options[:handler_options] ||= {}
+      @options[:callbacks] ||= {}
       @options[:cow_friendly] = true if @options[:cow_friendly].nil?
     end
+    
+    def validate_file(filename)
+      # file validation
+      if File.exist?(filename)
+        if !File.file?(filename)
+          raise ConfigError, "'#{filename}' is not a regular file"
+        elsif !File.writable?(filename)
+          raise ConfigError, "'#{filename}' is not writable!"
+        end
+      else # ensure directory is writable
+        dir = File.dirname(filename)
+        if not File.writable?(dir)
+          raise ConfigError, "'#{dir}' is not writable!"
+        end
+        File.open(filename, 'w') { |f| f.write('') } #creating empty file
+      end
+    end
 
     def validate
       raise ConfigError, "Workers count should be more then zero" if @options[:workers] < 1
@@ -47,25 +66,11 @@ module Daemonizer
         raise ConfigError, "start should be set" if @options[:start].nil?
         raise ConfigError, "start should have block" unless @options[:start].is_a?(Proc)
       end
-      
-      # file validation
-      if File.exist?(self.log_file)
-        if !File.file?(self.log_file)
-          raise ConfigError, "'#{self.log_file}' is not a regular file"
-        elsif !File.writable?(self.log_file)
-          raise ConfigError, "'#{self.log_file}' is not writable!"
-        end
-      else # ensure directory is writable
-        dir = File.dirname(self.log_file)
-        if not File.writable?(dir)
-          raise ConfigError, "'#{dir}' is not writable!"
-        end
-        File.open(self.log_file, 'w') { |f| f.write('') } #creating empty file
-      end
-      
+      validate_file(self.log_file)
+      validate_file(self.pid_file)
     end
 
-    [:workers, :poll_period, :root, :cow_friendly].each do |method|
+    [:workers, :poll_period, :root, :cow_friendly, :callbacks].each do |method|
       define_method method do
         @options[method.to_sym]
       end

data/lib/daemonizer/dsl.rb

@@ -25,8 +25,17 @@ class Daemonizer::Dsl
     end
   end
   
-  def after_fork(&block)
-    set_option :after_fork, block
+  CALLBACKS = [:before_prepare, :after_prepare, :before_start]
+  def set_callback(callback, &block)
+    return unless CALLBACKS.include?(callback.to_sym)
+    @options[:callbacks] ||= {}
+    @options[:callbacks][callback.to_sym] = block
+  end
+  
+  CALLBACKS.each do |callback|
+    define_method callback.to_sym do |&block|
+      set_callback callback.to_sym, &block
+    end
   end
 
   def not_cow_friendly

data/lib/daemonizer/engine.rb

@@ -7,6 +7,13 @@ module Daemonizer
       Daemonizer.logger_context = "#{Process.pid}/monitor"
     end
     
+    def run_callback(callback, *args)
+      if block = @config.callbacks[callback.to_sym]
+        Daemonizer.logger.info "Running :#{callback} callback"
+        block.call(*args)
+      end
+    end
+    
     def start!
       @pm = ProcessManager.new(@config)
 
@@ -15,7 +22,7 @@ module Daemonizer
           @pm.start_workers do |process_id|
             @config.handler.worker_id = process_id
             @config.handler.workers_count = @config.workers
-            @config.handler.after_fork
+            run_callback(:before_start, Daemonizer.logger, process_id, @config.workers)
             @config.handler.start
           end
         rescue Exception => e
@@ -32,9 +39,12 @@ module Daemonizer
           	Daemonizer.logger.info "COW-friendly feature is not supported by currently used ruby version"
           end
         end
-        Daemonizer.logger.info "Workers count is #{config.workers}"
         @config.handler.logger = Daemonizer.logger
-        @config.handler.prepare(init_block)
+        run_callback(:before_prepare, Daemonizer.logger)
+        Daemonizer.logger.info "Workers count is #{config.workers}"
+        @config.handler.prepare(init_block) do
+          run_callback(:after_prepare, Daemonizer.logger)
+        end
       rescue Exception => e
         log_error(e)
       end
@@ -52,6 +62,7 @@ module Daemonizer
         begin
           @config.handler.worker_id = 1
           @config.handler.workers_count = 1
+          run_callback(:before_start, Daemonizer.logger, 1, 1)
           @config.handler.start
         rescue Exception => e
           log_error(e)
@@ -59,7 +70,10 @@ module Daemonizer
       end
 
       begin
-        @config.handler.prepare(init_block)
+        run_callback(:before_prepare, Daemonizer.logger)
+        @config.handler.prepare(init_block) do
+          run_callback(:after_prepare, Daemonizer.logger)
+        end
       rescue Exception => e
         log_error(e)
       end

data/lib/daemonizer/handler.rb

@@ -8,8 +8,11 @@ module Daemonizer
       @handler_options = handler_options
     end
     
-    def prepare(block)
-      block.call
+    def prepare(starter, &block)
+      if block_given?
+        yield
+      end
+      starter.call
     end
     
     def option(key)
@@ -19,12 +22,6 @@ module Daemonizer
         nil
       end
     end
-    
-    def after_fork
-      if block = option(:after_fork)
-        block.call(Daemonizer.logger, @worker_id, @workers_count)
-      end
-    end
   end
   
   class FakeHandler < Handler
@@ -34,7 +31,7 @@ module Daemonizer
       super(handler_options)
     end
     
-    def prepare(block)
+    def prepare(starter, &block)
       if @prepare
         @prepare.call(Daemonizer.logger, block)
       else

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 10
-  version: 0.3.10
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gleb Pomykalov