daemonizer 0.4.18 → 0.5.0.beta.1

data/.gitignore

@@ -0,0 +1,7 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+coverage
+tmp
+

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in daemonizer.gemspec
+gemspec

data/Rakefile

@@ -1,35 +1,15 @@
-require 'rubygems'
-require 'rubygems/specification'
+require "bundler/gem_tasks"
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "daemonizer"
-    gemspec.summary = "Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model"
-    gemspec.description = "Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops"
-    gemspec.email = "glebpom@gmail.com"
-    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']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = %w(-fs --color)
+  t.ruby_opts  = %w(-w)
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+desc  "Run all specs with rcov"
+RSpec::Core::RakeTask.new(:rcov => :spec) do |t|
+  t.rcov = true
+  t.rcov_opts = %w{--exclude gems\/,spec\/}
 end
 
 task :spec => :check_dependencies

data/daemonizer.gemspec

@@ -1,77 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "daemonizer/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{daemonizer}
-  s.version = "0.4.18"
+  s.name        = "daemonizer"
+  s.version     = Daemonizer::VERSION
+  s.authors     = ["Gleb Pomykalov"]
+  s.email       = ["glebpom@gmail.com"]
+  s.homepage    = "http://github.com/glebpom/daemonizer"
+  s.summary     = "Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model"
+  s.description = "Inspired by bundler and rack. Mostly built on top of Alexey Kovyrin's loops code. http://github.com/kovyrin/loops"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2011-10-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}
-  s.executables = ["daemonizer"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    "LICENSE",
-    "README.md",
-    "ROADMAP",
-    "Rakefile",
-    "VERSION",
-    "bin/daemonizer",
-    "daemonizer.gemspec",
-    "lib/daemonizer.rb",
-    "lib/daemonizer/autoload.rb",
-    "lib/daemonizer/cli.rb",
-    "lib/daemonizer/config.rb",
-    "lib/daemonizer/daemonize.rb",
-    "lib/daemonizer/dsl.rb",
-    "lib/daemonizer/engine.rb",
-    "lib/daemonizer/errors.rb",
-    "lib/daemonizer/handler.rb",
-    "lib/daemonizer/option.rb",
-    "lib/daemonizer/process_manager.rb",
-    "lib/daemonizer/stats.rb",
-    "lib/daemonizer/worker.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.rubyforge_project = "daemonizer"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
-  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
-    s.specification_version = 3
+  s.add_development_dependency "rspec", ">=2.1.0"
+  s.add_development_dependency "mocha", ">=0.9.9"
+  s.add_development_dependency "yard", ">= 0"
+  s.add_development_dependency "rake"
 
-    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
+  s.add_runtime_dependency "thor", ">= 0.13.7"
+  s.add_runtime_dependency "simple-statistics", ">=0.0.3"
 end
-

data/lib/daemonizer.rb

@@ -1,3 +1,4 @@
+require 'daemonizer/version'
 require 'rubygems'
 require 'yaml'
 require 'erb'
@@ -5,7 +6,6 @@ require 'pathname'
 require 'logger'
 require 'simple-statistics'
 
-
 module Daemonizer
 
   def self.root=(value)
@@ -59,7 +59,7 @@ module Daemonizer
     @@log_level ||= :info
   end
 
-  def self.init_logger(name, log_file)
+  def self.init_logger(log_file)
     @@logger_file = File.open(log_file, File::WRONLY | File::APPEND)
     @@logger_file.sync = true
     @@logger = Logger.new(@@logger_file)
@@ -74,7 +74,13 @@ module Daemonizer
   end
 
   def self.reopen_log_file
-    true #do not need it in append-only mode
+    if @@logger_file.respond_to?(:path)
+      log_file = @@logger_file.path
+      f = File.open(log_file, File::WRONLY | File::APPEND | File::CREAT)
+      f.sync = true
+      @@logger_file.reopen(f)
+    end
+    true
   end
 
   def self.flush_logger
@@ -100,7 +106,7 @@ module Daemonizer
   end
 
   def self.find_pools(pool_name = nil)
-    pools = Dsl.evaluate(daemonfile)
+    pools = Dsl.evaluate(File.read(daemonfile.to_s), daemonfile.to_s).process
 
     if pool_name
       if pool = pools[pool_name.to_sym]

data/lib/daemonizer/cli.rb

@@ -109,6 +109,19 @@ module Daemonizer
       end
     end
 
+    desc "logrotate", "Reopen all log files"
+    def logrotate(pool_name = nil)
+      control_pools_loop(pool_name, "log file reopened") do |pool|
+        # Pid file check
+        unless Daemonize.check_pid(pool.pid_file)
+          print_pool pool.name,  "not started!"
+          exit(1)
+        end
+
+        Process.kill('HUP', Daemonize.read_pid(pool.pid_file))
+      end
+    end
+
   private
     def control_pools_loop(pool_name, message = nil, debug = false, &block)
       if debug
@@ -122,7 +135,7 @@ module Daemonizer
       else
         Daemonizer.find_pools(pool_name).each do |pool|
           Process.fork do
-            Daemonizer.init_logger(pool.name.to_s, pool.log_file)
+            Daemonizer.init_logger(pool.log_file)
             yield(pool)
           end
           Process.wait

data/lib/daemonizer/config.rb

@@ -62,7 +62,7 @@ module Daemonizer
       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')
+        raise ConfigError, "Handler should respond to :start" unless @options[:handler].public_instance_methods.map(&:to_sym).include?(:start)
         raise ConfigError, "Handler set. Don't use :start and :before init in Demfile" if @options[:prepare] || @options[:start]
       else
         if @options[:prepare]
@@ -84,7 +84,7 @@ module Daemonizer
 
     [:log_file, :pid_file].each do |method|
       define_method method do
-        File.join(Daemonizer.root, @options[method.to_sym])
+        File.expand_path(@options[method.to_sym], Daemonizer.root)
       end
     end
 

data/lib/daemonizer/dsl.rb

@@ -1,10 +1,22 @@
 class Daemonizer::Dsl
   class DslError < StandardError; end
 
-  def self.evaluate(gemfile)
+  def self.evaluate(daemonfile, daemonfile_name = 'Daemonfile')
     builder = new
-    builder.instance_eval(File.read(gemfile.to_s), gemfile.to_s, 1)
-    builder.instance_variable_get("@configs")
+    builder.instance_eval(daemonfile, daemonfile_name.to_s, 1)
+    builder
+  end
+
+  def configs
+    @configs
+  end
+
+  def process
+    result = {}
+    @configs.each do |k,v|
+      result[k] = Daemonizer::Config.new(k, v)
+    end
+    result
   end
 
   def initialize
@@ -92,7 +104,7 @@ class Daemonizer::Dsl
     @pool = name.to_sym
     options = config_copy
     yield
-    @configs[@pool] = Daemonizer::Config.new(@pool, @options)
+    @configs[@pool] = @options.clone
   rescue Daemonizer::Config::ConfigError => e
     puts "* Error in pool \"#{@pool}\": #{e.to_s}. Skipping..."
   ensure

data/lib/daemonizer/engine.rb

@@ -2,11 +2,11 @@ module Daemonizer
   class Engine
     attr_reader :config
 
-    def initialize(config, debug = false)
+    def initialize(config)
       @config = config
       Daemonizer.logger_context = "#{Process.pid}/monitor"
     end
-    
+
     def run_callback(callback, *args)
       if callbacks = @config.callbacks[callback.to_sym] and callbacks.any?
         Daemonizer.logger.info "Running :#{callback} callbacks"
@@ -15,22 +15,22 @@ module Daemonizer
         end
       end
     end
-    
-    def start!
-      @pm = ProcessManager.new(@config)
 
-      init_block = Proc.new do
-        begin
-          @pm.start_workers do |process_id|
-            @config.handler.worker_id = process_id
-            @config.handler.workers_count = @config.workers
-            run_callback :before_start, @config.pool, process_id, @config.workers
-            @config.handler.start
-          end
-        rescue Exception => e
-          log_error(e)
-        end
+    def run_prepare_with_callbacks(&block)
+      run_callback :before_prepare, @config.pool
+      Daemonizer.logger.info "Workers count is #{@config.workers}"
+      @config.handler.prepare(block) do
+        run_callback :after_prepare, @config.pool
       end
+    end
+
+    def run_start_with_callbacks
+      run_callback :before_start, @config.pool, @config.handler.worker_id, @config.handler.workers_count
+      @config.handler.start
+    end
+
+    def start!
+      @pm = ProcessManager.new(@config)
 
       begin
         if @config.cow_friendly
@@ -42,16 +42,22 @@ module Daemonizer
           end
         end
         @config.handler.logger = Daemonizer.logger
-        run_callback :before_prepare, @config.pool
-        Daemonizer.logger.info "Workers count is #{config.workers}"
-        @config.handler.prepare(init_block) do
-          run_callback :after_prepare, @config.pool
+        run_prepare_with_callbacks do
+          begin
+            @pm.start_workers do |process_id|
+              @config.handler.worker_id = process_id
+              @config.handler.workers_count = @config.workers
+              run_start_with_callbacks
+            end
+          rescue Exception => e
+            log_error(e)
+          end
         end
       rescue Exception => e
         log_error(e)
       end
       # Start monitoring loop
-      
+
       setup_signals
       @pm.monitor_workers
     end
@@ -59,28 +65,22 @@ module Daemonizer
     def debug!
       Daemonizer.init_console_logger('console')
       @config.handler.logger = Daemonizer.logger
-      
-      init_block = Proc.new do
-        begin
-          @config.handler.worker_id = 1
-          @config.handler.workers_count = 1
-          run_callback :before_start, @config.pool, 1, 1
-          @config.handler.start
-        rescue Exception => e
-          log_error(e)
-        end
-      end
 
       begin
-        run_callback :before_prepare, @config.pool
-        @config.handler.prepare(init_block) do
-          run_callback :after_prepare, @config.pool
+        run_prepare_with_callbacks do
+          begin
+            @config.handler.worker_id = 1
+            @config.handler.workers_count = 1
+            run_start_with_callbacks
+          rescue Exception => e
+            log_error(e)
+          end
         end
       rescue Exception => e
         log_error(e)
       end
     end
-    
+
     def log_error(e)
       Daemonizer.logger.fatal e.to_s
       Daemonizer.logger.fatal "#{e.class}: #{e}\n" + e.backtrace.join("\n")
@@ -96,6 +96,11 @@ module Daemonizer
         trap('TERM', stop)
         trap('INT', stop)
         trap('EXIT', stop)
+
+        trap('SIGHUP') do
+          Daemonizer.reopen_log_file
+          @pm.send_signal_to_workers('SIGHUP')
+        end
       end
 
   end

data/lib/daemonizer/option.rb

@@ -1,7 +1,7 @@
 module Daemonizer
   class Option
     class OptionError < StandardError; end
-         
+
     def initialize(option, value, auto_eval = false)
       @option = option
       @value = value
@@ -10,11 +10,17 @@ module Daemonizer
         raise OptionError, "auto_apply can be used only with callable option"
       end
     end
-    
+
     def value(handler = nil)
-      if @auto_eval && @value.is_a?(Proc) 
+      if @auto_eval && @value.is_a?(Proc)
         if handler && handler.worker_id && handler.workers_count
-          return @value.call(handler.worker_id, handler.workers_count)
+          if @value.arity == 0 || @value.arity == -1
+            return @value.call
+          elsif @value.arity == 2
+            return @value.call(handler.worker_id, handler.workers_count)
+          else
+            raise OptionError, "option lambda should accept 0 or 2 parameters"
+          end
         else
           raise OptionError, "value called before handler initialized"
         end
@@ -22,6 +28,6 @@ module Daemonizer
         @value
       end
     end
-    
+
   end
 end