daemonizer 0.4.14 → 0.4.15

data/VERSION

@@ -1 +1 @@
-0.4.14
+0.4.15

data/daemonizer.gemspec

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

data/lib/daemonizer.rb

@@ -7,7 +7,7 @@ require 'simple-statistics'
 
 
 module Daemonizer
-  
+
   def self.root=(value)
     @@root = value
   end
@@ -19,12 +19,22 @@ module Daemonizer
       File.dirname(daemonfile)
     end
   end
-  
+
+  def self.find_daemonfile(daemonfile_name)
+    previous = nil
+    current  = File.expand_path(Dir.pwd)
+
+    until !File.directory?(current) || current == previous
+      filename = File.join(current, daemonfile_name)
+      return filename if File.file?(filename)
+      current, previous = File.expand_path("..", current), current
+    end
+  end
+
   def self.daemonfile=(daemonfile_name)
-    @@daemonfile = File.expand_path(daemonfile_name)
-    @@daemonfile
+    @@daemonfile = find_daemonfile(daemonfile_name)
   end
-  
+
   def self.daemonfile
     if defined?(@@daemonfile)
       @@daemonfile
@@ -32,43 +42,51 @@ module Daemonizer
       "Demfile"
     end
   end
-  
+
   def self.logger_context=(str)
     @@logger_context = str
   end
-  
+
   def self.logger_context
     @@logger_context
   end
-  
+
+  def self.log_level=(level)
+    @@log_level = level
+  end
+
+  def self.log_level
+    @@log_level ||= :info
+  end
+
   def self.init_logger(name, log_file)
     @@logger_file = File.open(log_file, File::WRONLY | File::APPEND)
     @@logger_file.sync = true
     @@logger = Logger.new(@@logger_file)
     set_logger_common_options
   end
-  
+
   def self.set_logger_common_options
-    @@logger.sev_threshold = Logger::INFO
+    @@logger.sev_threshold = Logger::const_get(Daemonizer.log_level.to_s.upcase) || Logger::INFO
     @@logger.formatter = Proc.new do |severity, datetime, progname, msg|
       "%s %s -- %s -- %s\n" % [ datetime.strftime("%Y-%m-%d %H:%M:%S"), severity, Daemonizer.logger_context, msg ]
     end
   end
-  
+
   def self.reopen_log_file
     true #do not need it in append-only mode
   end
-  
+
   def self.flush_logger
     @@logger_file.flush
   end
-  
+
   def self.init_console_logger(name)
     @@logger_file = STDOUT
     @@logger = Logger.new(@@logger_file)
     set_logger_common_options
   end
-  
+
   def self.logger
     if defined?(@@logger)
       @@logger
@@ -80,8 +98,8 @@ module Daemonizer
   def self.[](pool)
     find_pools(pool).first or nil
   end
-  
-  def self.find_pools(pool_name = nil)    
+
+  def self.find_pools(pool_name = nil)
     pools = Dsl.evaluate(daemonfile)
 
     if pool_name
@@ -95,7 +113,7 @@ module Daemonizer
       pools.values
     end
   end
-  
+
 end
 
 require File.dirname(__FILE__) + '/../lib/daemonizer/autoload'

data/lib/daemonizer/cli.rb

@@ -1,7 +1,7 @@
 require 'thor'
 require 'rubygems/config_file'
 
-module Daemonizer  
+module Daemonizer
   class CLI < Thor
     check_unknown_options!
 
@@ -11,7 +11,7 @@ module Daemonizer
       super
       Daemonizer.daemonfile = options[:daemonfile] || "Daemonfile"
     end
-                
+
     desc "start", "Start pool"
     def start(pool_name = nil)
       control_pools_loop(pool_name, "successfully started") do |pool|
@@ -24,7 +24,7 @@ module Daemonizer
         print_pool pool.name,  "Starting pool"
 
         app_name = "#{pool.name} monitor\0"
-        
+
         Daemonize.daemonize(app_name)
 
         Dir.chdir(Daemonizer.root) # Make sure we're in the working directory
@@ -41,7 +41,7 @@ module Daemonizer
       end
       return true
     end
-    
+
     desc "stop", "Stop pool"
     def stop(pool_name = nil)
       control_pools_loop(pool_name, "successfully stoped") do |pool|
@@ -69,9 +69,9 @@ module Daemonizer
     desc "list", "List of pools"
     def list
       puts "List of configured pools:"
-      puts "" 
+      puts ""
       Daemonizer.find_pools(nil).each do |pool|
-        puts "  * #{pool.name}" 
+        puts "  * #{pool.name}"
       end
       puts ""
       return true
@@ -88,19 +88,19 @@ module Daemonizer
       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|        
+      end
+      control_pools_loop(pool_name, "execution ended", true) do |pool|
         STDOUT.sync = true
-        
+
         engine = Engine.new(pool)
         engine.debug!
-        
+
         print_pool pool.name,  " Done!"
         exit(0)
       end
-      return true    
+      return true
     end
-    
+
     desc "stats", "Pools statistics"
     def stats(pool_name = nil)
       Daemonizer.find_pools(pool_name).each do |pool|
@@ -108,29 +108,31 @@ module Daemonizer
         statistics.print
       end
     end
-    
+
   private
     def control_pools_loop(pool_name, message = nil, debug = false, &block)
-      Daemonizer.find_pools(pool_name).each do |pool|
-        Process.fork do
-          if debug
-            Daemonizer.init_console_logger(pool.name.to_s)
-          else
-            Daemonizer.init_logger(pool.name.to_s, pool.log_file)
-          end
+      if debug
+        pool = Daemonizer.find_pools(pool_name).first
+        Daemonizer.init_console_logger(pool.name.to_s)
+        begin
           yield(pool)
+        rescue Interrupt => e
+          puts "Interrupted from keyboard"
         end
-        begin
+      else
+        Daemonizer.find_pools(pool_name).each do |pool|
+          Process.fork do
+            Daemonizer.init_logger(pool.name.to_s, pool.log_file)
+            yield(pool)
+          end
           Process.wait
           if $?.exitstatus == 0 and message
-            print_pool pool.name, message 
+            print_pool pool.name, message
           end
-        rescue Interrupt => e
-          puts "Interrupted from keyboard"
         end
       end
     end
-    
+
     def print_pool(pool_name, message)
       puts "#{pool_name}: #{message}"
     end

data/lib/daemonizer/config.rb

@@ -1,5 +1,7 @@
 module Daemonizer
   class Config
+    VALID_LOG_LEVELS = [:debug, :info, :warn, :error, :fatal]
+
     class ConfigError < StandardError;  end
 
     attr_reader :pool, :handler
@@ -34,8 +36,9 @@ module Daemonizer
       @options[:callbacks] ||= {}
       @options[:on_poll] ||= []
       @options[:cow_friendly] = true if @options[:cow_friendly].nil?
+      @options[:log_level] ||= :info
     end
-    
+
     def validate_file(filename)
       # file validation
       if File.exist?(filename)
@@ -56,6 +59,7 @@ module Daemonizer
     def validate
       raise ConfigError, "Workers count should be more then zero" if @options[:workers] < 1
       raise ConfigError, "Poll period should be more then zero" if @options[:poll_period] < 1
+      raise ConfigError, "Log level should be one of [#{VALID_LOG_LEVELS.map(&:to_s).join(',')}]" unless VALID_LOG_LEVELS.include?(@options[:log_level].to_sym)
       if @options[:handler]
         raise ConfigError, "Handler should be a class" unless @options[:handler].is_a?(Class)
         raise ConfigError, "Handler should respond to :start" unless @options[:handler].public_instance_methods.include?('start')
@@ -67,6 +71,7 @@ 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
+
       validate_file(self.log_file)
       validate_file(self.pid_file)
     end
@@ -82,7 +87,7 @@ module Daemonizer
         File.join(Daemonizer.root, @options[method.to_sym])
       end
     end
-    
+
     def name
       @pool
     end

data/lib/daemonizer/dsl.rb

@@ -13,7 +13,7 @@ class Daemonizer::Dsl
     @pool     = :default
     @configs  = {}
   end
-  
+
   def set_option(option, value = nil, &block)
     @options[:handler_options] ||= {}
     if not value.nil?
@@ -24,7 +24,7 @@ class Daemonizer::Dsl
       raise DslError, "you should supply block or value to :set_option"
     end
   end
-  
+
   CALLBACKS = [:before_prepare, :after_prepare, :before_start]
   def set_callback(callback, &block)
     return unless CALLBACKS.include?(callback.to_sym)
@@ -32,13 +32,17 @@ class Daemonizer::Dsl
     @options[:callbacks][callback.to_sym] ||= []
     @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 log_level(level)
+    @options[:log_level] = level.to_sym
+  end
+
   def on_poll(&block)
     @options[:on_poll] ||= []
     @options[:on_poll] << block
@@ -48,31 +52,31 @@ class Daemonizer::Dsl
   def not_cow_friendly
     @options[:cow_friendly] = false
   end
-    
+
   def handler(handler)
     @options[:handler] = handler
   end
-      
+
   def poll_period(seconds)
     @options[:poll_period] = seconds.to_i
   end
-  
+
   def log_file(log)
     @options[:log_file] = log
   end
-  
+
   def workers(num)
     @options[:workers] = num.to_i
   end
-    
+
   def prepare(&blk)
     @options[:prepare] = blk
   end
-  
+
   def start(&blk)
     @options[:start] = blk
   end
-  
+
   def pid_file(pid)
     @options[:pid_file] = pid
   end
@@ -95,7 +99,7 @@ class Daemonizer::Dsl
     @options = options
     @pool = nil
   end
-  
+
   def config_copy
     options = @options.dup
     options[:handler_options] = @options[:handler_options].dup if @options[:handler_options]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 4
-  - 14
-  version: 0.4.14
+  - 15
+  version: 0.4.15
 platform: ruby
 authors: 
 - Gleb Pomykalov