wonko9-i_can_daemonize 0.7.0 → 0.7.1

data/README.txt

@@ -62,7 +62,7 @@ Your daemon can be called with a number of options
 You can add your own command line options by using the 'arg' class macro.  
 See http://www.ruby-doc.org/stdlib/libdoc/optparse/rdoc/classes/OptionParser.html for more info on OptionParser.
   
-  arg '--scott-rocks', 'Does scott rock?') do |value|
+  arg('--scott-rocks', 'Does scott rock?') do |value|
     @scott_rocks = value
   end
   

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 7

data/lib/i_can_daemonize.rb

@@ -38,7 +38,7 @@ module ICanDaemonize
 
         opt.on_tail('-h', '--help', 'Show this message') do
           puts opt
-          exit
+          exit(1)
         end
 
         opt.on('--loop-every=SECONDS', 'How long to sleep between each loop') do |value|
@@ -102,6 +102,10 @@ module ICanDaemonize
       @options ||= {}
     end
 
+    def options=(options)
+      @options = options
+    end
+
     def config
       yield @@config
     end
@@ -114,8 +118,10 @@ module ICanDaemonize
       callbacks[:after] = block
     end
 
-    def sig(signal, &block)
-      callbacks["sig_#{signal}".to_sym] = block
+    def sig(*signals, &block)
+      signals.each do |s|
+        callbacks["sig_#{s}".to_sym] = block
+      end
     end
 
     def die_if(method=nil,&block)
@@ -138,6 +144,9 @@ module ICanDaemonize
     # <tt>:timeout</tt> Fixnum (DEFAULT 0)
     #  Timeout in if block does not execute withing passed number of seconds
     #
+    # <tt>:kill_timeout</tt> Fixnum (DEFAULT 120)
+    #  Wait number of seconds before using kill -9 on daemon
+    #
     # <tt>:die_on_timeout</tt> BOOL (DEFAULT False)
     #  Should the daemon continue running if a block times out, or just run the block again
     #
@@ -163,10 +172,10 @@ module ICanDaemonize
     # <tt>:log_prefix</tt> BOOL (DEFAULT true)
     #  Prefix log file entries with PID and timestamp
     def daemonize(opts={}, &block)
+      self.options = opts
       parse_options
       return unless ok_to_start?
 
-      options.merge!(opts)
       puts "Starting #{instances_to_start} #{script_name} #{pluralize('instance', instances_to_start)}..."
       puts "Logging to: #{log_file}" unless ontop?
       
@@ -209,6 +218,7 @@ module ICanDaemonize
     def run_block(&block)
       loop do
         break unless running?
+
         if options[:timeout]
           begin
             Timeout::timeout(options[:timeout].to_i) do
@@ -223,13 +233,14 @@ module ICanDaemonize
           end            
         else
           block.call if block
-          
         end
+
         if options[:loop_every]
           sleep options[:loop_every].to_i
         elsif not block
           sleep 0.1
         end
+
         break if should_exit?
         raise DieTime.new('Die if conditions were met!') if should_die?
       end                    
@@ -278,12 +289,12 @@ module ICanDaemonize
             living_pids << pid
           else
             $stderr.puts "Removing stale pid: #{pid}..."
-            pids -= [pid]
+            pids.delete(pid)
             self.pids = pids
           end
         end
         if instances > 0 and living_pids.size >= instances
-          $stderr.puts "#{script_name} is already running #{living_pids.size} out of #{pluralize('instance', instances)}"
+          $stderr.puts "#{script_name} is already running #{living_pids.size} out of #{instances} #{pluralize('instance', instances)}"
           return false          
         end
       end
@@ -296,7 +307,7 @@ module ICanDaemonize
       puts "Stopping #{instances} #{script_name} #{pluralize('instance', instances)}..."
       if pids.empty?
         $stderr.puts "#{script_name} doesn't appear to be running"
-        exit
+        exit(1)
       end
       pids.each_with_index do |pid, ii|
         kill_pid(pid)
@@ -314,7 +325,7 @@ module ICanDaemonize
       $stdout.puts("Stopping pid #{pid} with #{signal}...")
       begin
         Process.kill(signal, pid)             
-        if pid_running?(pid, options[:timeout] || 120)
+        if pid_running?(pid, options[:kill_timeout] || 120)
           $stdout.puts("Using kill -9 #{pid}")
           Process.kill(9, pid)
         else

data/test/simple_daemon.rb

@@ -12,6 +12,9 @@ class SimpleDaemon
     @short_test = value
   end
 
+  sig(:int, :term) do
+  end
+
   counter = 0
   daemonize do
     if @options[:loop_every]

data/test/test_i_can_daemonize.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestICanDaemonize < Test::Unit::TestCase
-  DEFAULT_LOG_FILE = File.join(File.dirname(__FILE__), 'test_daemon.rb.log')
+  DEFAULT_LOG_FILE = File.dirname(__FILE__) + '/simple_daemon.log'
 
   def setup
     File.delete(TEST_FILE) if File.exist?(TEST_FILE)
@@ -36,4 +36,12 @@ class TestICanDaemonize < Test::Unit::TestCase
     assert_equal "test|short-test", File.read(TEST_FILE)
   end
 
+  test "delete stale pid" do
+    pidfile = File.dirname(__FILE__) + '/testpids.pid'
+    File.open(pidfile, 'w'){|f| f << '999999999'}
+    `ruby #{@daemon} start --pid-file=#{pidfile}`
+    `ruby #{@daemon} stop --pid-file=#{pidfile}`
+    assert !File.exist?(pidfile)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wonko9-i_can_daemonize
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Adam Pisoni
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -08:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: []