daemonizer 0.1.5 → 0.1.6

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "daemonizer"
-    gemspec.summary = "Daemonizer allows you to easily create custom daemons on ruby. Supporting preforked and threaded models."
+    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"

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/daemonizer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   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 preforked and threaded models.}
+  s.summary = %q{Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/daemonizer/config.rb

@@ -33,7 +33,6 @@ module Daemonizer
     def init_defaults
       @options[:before_init] ||= nil
       @options[:after_init] ||= nil
-      @options[:engine] ||= :fork
       @options[:workers] ||= 1
       @options[:log_file] ||= "log/#{@pool}.log"
       @options[:poll_period] ||= 5
@@ -45,8 +44,6 @@ module Daemonizer
 
     def validate
       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)
@@ -61,7 +58,7 @@ module Daemonizer
       end
     end
 
-    [:engine, :workers, :poll_period, :root, :cow_friendly].each do |method|
+    [:workers, :poll_period, :root, :cow_friendly].each do |method|
       define_method method do
         @options[method.to_sym]
       end

data/lib/daemonizer/dsl.rb

@@ -44,11 +44,7 @@ class Daemonizer::Dsl
   def workers(num)
     @options[:workers] = num.to_i
   end
-  
-  def engine(name)
-    @options[:engine] = name.to_sym
-  end
-  
+    
   def before_init(&blk)
     @options[:before_init] = blk
   end

data/lib/daemonizer/process_manager.rb

@@ -13,7 +13,7 @@ module Daemonizer
     def start_workers(&blk)
       raise ArgumentError, "Need a worker block!" unless block_given?
 
-      @worker_pools[@config.pool] = WorkerPool.new(@config.pool, self, @config.engine, &blk)
+      @worker_pools[@config.pool] = WorkerPool.new(@config.pool, self, &blk)
       @worker_pools[@config.pool].start_workers(@config.workers)
     end
 

data/lib/daemonizer/worker.rb

@@ -3,7 +3,7 @@ module Daemonizer
     attr_reader :name
     attr_reader :pid
 
-    def initialize(name, pm, engine, worker_id, &blk)
+    def initialize(name, pm, worker_id, &blk)
       raise ArgumentError, "Need a worker block!" unless block_given?
 
       @name = name
@@ -23,80 +23,60 @@ module Daemonizer
 
     def run
       return if shutdown?
-      if @engine == 'fork'
-        @pid = Kernel.fork do
-          Dir.chdir '/'
-          File.umask 0000
+      @pid = Kernel.fork do
+        Dir.chdir '/'
+        File.umask 0000
 
-          STDIN.reopen '/dev/null'
-          STDOUT.reopen '/dev/null', 'a'
-          STDERR.reopen STDOUT
-          
-          @pid = Process.pid
-          GDC.set "#{@pid}/#{@worker_id}"
-          normal_exit = false
-          begin
-            $0 = "#{@name} worker: instance #{@worker_id}\0"
-            @worker_block.call(@worker_id)
-            normal_exit = true
-            exit(0)
-          rescue Exception => e
-            message = SystemExit === e ? "exit(#{e.status})" : e.to_s
-            if SystemExit === e and e.success?
-              if normal_exit
-                logger.info("Worker finished: normal return")
-              else
-                logger.error("Worker exited: #{message} at #{e.backtrace.first}")
-              end
+        STDIN.reopen '/dev/null'
+        STDOUT.reopen '/dev/null', 'a'
+        STDERR.reopen STDOUT
+        
+        @pid = Process.pid
+        GDC.set "#{@pid}/#{@worker_id}"
+        normal_exit = false
+        begin
+          $0 = "#{@name} worker: instance #{@worker_id}\0"
+          @worker_block.call(@worker_id)
+          normal_exit = true
+          exit(0)
+        rescue Exception => e
+          message = SystemExit === e ? "exit(#{e.status})" : e.to_s
+          if SystemExit === e and e.success?
+            if normal_exit
+              logger.info("Worker finished: normal return")
             else
-              logger.error("Worker exited with error: #{message}\n  #{e.backtrace.join("\n  ")}")
+              logger.error("Worker exited: #{message} at #{e.backtrace.first}")
             end
-            logger.debug("Terminating #{@name} worker: #{@pid}")
+          else
+            logger.error("Worker exited with error: #{message}\n  #{e.backtrace.join("\n  ")}")
           end
+          logger.debug("Terminating #{@name} worker: #{@pid}")
         end
-      elsif @engine == 'thread'
-        @thread = Thread.start do
-          @worker_block.call(@worker_id)
-        end
-      else
-        raise ArgumentError, "Invalid engine name: #{@engine}"
       end
     rescue Exception => e
       logger.error("Exception from worker: #{e} at #{e.backtrace.first}")
     end
 
     def running?(verbose = false)
-      if @engine == 'fork'
-        return false unless @pid
-        begin
-          Process.waitpid(@pid, Process::WNOHANG)
-          res = Process.kill(0, @pid)
-          logger.debug("KILL(#{@pid}) = #{res}") if verbose
-          return true
-        rescue Errno::ESRCH, Errno::ECHILD, Errno::EPERM => e
-          logger.error("Exception from kill: #{e} at #{e.backtrace.first}") if verbose
-          return false
-        end
-      elsif @engine == 'thread'
-        @thread && @thread.alive?
-      else
-        raise ArgumentError, "Invalid engine name: #{@engine}"
+      return false unless @pid
+      begin
+        Process.waitpid(@pid, Process::WNOHANG)
+        res = Process.kill(0, @pid)
+        logger.debug("KILL(#{@pid}) = #{res}") if verbose
+        return true
+      rescue Errno::ESRCH, Errno::ECHILD, Errno::EPERM => e
+        logger.error("Exception from kill: #{e} at #{e.backtrace.first}") if verbose
+        return false
       end
     end
 
     def stop(force = false)
-      if @engine == 'fork'
-        begin
-          sig = force ? 'SIGKILL' : 'SIGTERM'
-          logger.debug("Sending #{sig} to ##{@pid}")
-          Process.kill(sig, @pid)
-        rescue Errno::ESRCH, Errno::ECHILD, Errno::EPERM=> e
-          logger.error("Exception from kill: #{e} at #{e.backtrace.first}")
-        end
-      elsif @engine == 'thread'
-        force && !defined?(::JRuby) ? @thread.kill! : @thread.kill
-      else
-        raise ArgumentError, "Invalid engine name: #{@engine}"
+      begin
+        sig = force ? 'SIGKILL' : 'SIGTERM'
+        logger.debug("Sending #{sig} to ##{@pid}")
+        Process.kill(sig, @pid)
+      rescue Errno::ESRCH, Errno::ECHILD, Errno::EPERM=> e
+        logger.error("Exception from kill: #{e} at #{e.backtrace.first}")
       end
     end
   end

data/lib/daemonizer/worker_pool.rb

@@ -2,11 +2,10 @@ module Daemonizer
   class WorkerPool
     attr_reader :name, :logger
 
-    def initialize(name, pm, engine, &blk)
+    def initialize(name, pm, &blk)
       @name = name
       @pm = pm
       @worker_block = blk
-      @engine = engine
       @workers = []
       @logger = @pm.logger
     end
@@ -18,7 +17,7 @@ module Daemonizer
     def start_workers(number)
       logger.debug "Creating #{number} workers for #{name} pool..."
       number.times do |i|
-        @workers << Worker.new(name, @pm, @engine, i+1, &@worker_block)
+        @workers << Worker.new(name, @pm, i+1, &@worker_block)
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -113,6 +113,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Daemonizer allows you to easily create custom daemons on ruby. Supporting preforked and threaded models.
+summary: Daemonizer allows you to easily create custom daemons on ruby. Supporting prefork model
 test_files: []