daemons 1.0.4 → 1.0.5

data/LICENSE

@@ -0,0 +1,29 @@
+Copyright (c) 2005-2007 Thomas Uehlinger
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+This license does not apply to daemonize.rb, which is was written by 
+Travis Whitton und published under the following license:
+
+The Daemonize extension module is copywrited free software by Travis Whitton
+<whitton@atlantic.net>. You can redistribute it under the terms specified in
+the COPYING file of the Ruby distribution.

data/README

@@ -1,4 +1,4 @@
-= Daemons Version 1.0.4
+= Daemons Version 1.0.5
 
 (See Releases for release-specific information)
 
@@ -34,7 +34,7 @@ Layout: suppose you have your self-written server <tt>myserver.rb</tt>:
   
 To use <tt>myserver.rb</tt> in a production environment, you need to be able to
 run <tt>myserver.rb</tt> in the _background_ (this means detach it from the console, fork it
-in the background, release any directories and file descriptors).
+in the background, release all directories and file descriptors).
 
 Just create <tt>myserver_control.rb</tt> like this:
 
@@ -189,11 +189,36 @@ Homepage: http://physiker.ch
 
 == License
 
-The Daemons script is copywrited free software by Thomas Uehlinger
-<mailto:th.uehlinger@gmx.ch>. You can redistribute it under the terms specified in
+Copyright (c) 2005-2007 Thomas Uehlinger
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+This license does not apply to daemonize.rb, which is was written by 
+Travis Whitton und published under the following license:
+
+The Daemonize extension module is copywrited free software by Travis Whitton
+<whitton@atlantic.net>. You can redistribute it under the terms specified in
 the COPYING file of the Ruby distribution.
 
-
 == Feedback and other resources
 
 At http://rubyforge.org/projects/daemons.

data/Rakefile

@@ -13,7 +13,7 @@ require 'daemons'
 PKG_NAME = "daemons"
 
 PKG_FILES = FileList[
-  "Rakefile", "Releases", "TODO", "README", 
+  "Rakefile", "Releases", "TODO", "README", "LICENSE",
   "setup.rb",
   "lib/**/*.rb",
   "test/**/*",

data/Releases

@@ -1,5 +1,11 @@
 = Daemons Release History
 
+== Release 1.0.5: February 24, 2007
+
+* Applied patch that causes daemons to use '/var/log' as logfile 
+  directory if you use :dir_mode = :system (thanks to Han Holl).
+* Daemons should now work with Ruby 1.9 (at least the basic features).
+
 == Release 1.0.4: January 17, 2007
 
 * Document the :log_output option (thanks to Andrew Kuklewicz).

data/examples/call/call.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 
@@ -13,7 +13,7 @@ testfile = File.expand_path(__FILE__) + '.log'
 
 
 # On the first call to <tt<call</tt>, an application group (accessible by <tt>Daemons.group</tt>)
-# will be created an the options will be kept within, so you only have to specify
+# will be created and the options will be kept within, so you only have to specify
 # <tt>:multiple</tt> once.
 #
 

data/examples/call/call_monitor.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 

data/examples/daemonize/daemonize.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 

data/examples/run/ctrl_crash.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_exec.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_exit.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_monitor.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_multiple.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_normal.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_ontop.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_proc.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/examples/run/ctrl_proc.rb.output

@@ -4,3 +4,98 @@ ping from proc!
 ping from proc!
 ping from proc!
 ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!
+ping from proc!

data/examples/run/ctrl_proc_simple.rb

@@ -1,9 +1,9 @@
 lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
 
-if File.exists?(File.join(lib_dir, 'daemons.rb'))
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
   $LOAD_PATH.unshift lib_dir
 else
-  require 'rubygems' rescue nil
+  begin; require 'rubygems'; rescue ::Exception; end
 end
 
 require 'daemons'

data/lib/daemons.rb

@@ -65,7 +65,7 @@ require 'daemons/controller'
 #
 module Daemons
 
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   
   require 'daemons/daemonize'
   

data/lib/daemons/application.rb

@@ -42,7 +42,8 @@ module Daemons
     end
     
     def logfile
-      (options[:log_output] && pidfile_dir()) ? File.join(pidfile_dir(), @group.app_name + '.output') : nil
+      logdir = options[:dir_mode] == :system ? '/var/log' : pidfile_dir
+      (options[:log_output] && logdir) ? File.join(logdir, @group.app_name + '.output') : nil
     end
     
     
@@ -63,12 +64,12 @@ module Daemons
       # in your application!
       #
       at_exit {
-        @pid.cleanup rescue nil
+        begin; @pid.cleanup; rescue ::Exception; end
         
         # If the option <tt>:backtrace</tt> is used and the application did exit by itself
         # create a exception log.
         if options[:backtrace] and not options[:ontop] and not $daemons_sigterm
-          exception_log() rescue nil
+          begin; exception_log(); rescue ::Exception; end
         end
           
       }
@@ -79,7 +80,7 @@ module Daemons
       # 'TERM'.
       #
       trap('TERM') {
-        @pid.cleanup rescue nil
+        begin; @pid.cleanup; rescue ::Exception; end
         $daemons_sigterm = true
         
         exit
@@ -118,12 +119,12 @@ module Daemons
       # in your application!
       #
       at_exit {
-        @pid.cleanup rescue nil
+        begin; @pid.cleanup; rescue ::Exception; end
         
         # If the option <tt>:backtrace</tt> is used and the application did exit by itself
         # create a exception log.
         if options[:backtrace] and not options[:ontop] and not $daemons_sigterm
-          exception_log() rescue nil
+          begin; exception_log(); rescue ::Exception; end
         end
           
       }
@@ -134,7 +135,7 @@ module Daemons
       # 'TERM'.
       #
       trap('TERM') {
-        @pid.cleanup rescue nil
+        begin; @pid.cleanup; rescue ::Exception; end
         $daemons_sigterm = true
         
         exit
@@ -161,12 +162,12 @@ module Daemons
         # in your application!
         #
         at_exit {
-          @pid.cleanup rescue nil
+          begin; @pid.cleanup; rescue ::Exception; end
 
           # If the option <tt>:backtrace</tt> is used and the application did exit by itself
           # create a exception log.
           if options[:backtrace] and not options[:ontop] and not $daemons_sigterm
-            exception_log() rescue nil
+            begin; exception_log(); rescue ::Exception; end
           end
 
         }
@@ -177,7 +178,7 @@ module Daemons
         # 'TERM'.
         #
         trap('TERM') {
-          @pid.cleanup rescue nil
+          begin; @pid.cleanup; rescue ::Exception; end
           $daemons_sigterm = true
 
           exit
@@ -303,7 +304,7 @@ module Daemons
       
       # We try to remove the pid-files by ourselves, in case the application
       # didn't clean it up.
-      @pid.cleanup rescue nil
+      begin; @pid.cleanup; rescue ::Exception; end
       
     end
     
@@ -312,13 +313,13 @@ module Daemons
     end
     
     def zap!
-      @pid.cleanup rescue nil
+      begin; @pid.cleanup; rescue ::Exception; end
     end
     
     def show_status
       running = self.running?
       
-      puts "#{self.group.app_name}: #{running ? '' : 'not '}running#{(running and @pid.exists?) ? ' [pid ' + @pid.pid.to_s + ']' : ''}#{(@pid.exists? and not running) ? ' (but pid-file exists: ' + @pid.pid.to_s + ')' : ''}"
+      puts "#{self.group.app_name}: #{running ? '' : 'not '}running#{(running and @pid.exist?) ? ' [pid ' + @pid.pid.to_s + ']' : ''}#{(@pid.exist? and not running) ? ' (but pid-file exists: ' + @pid.pid.to_s + ')' : ''}"
     end
     
     # This function implements a (probably too simle) method to detect
@@ -329,7 +330,7 @@ module Daemons
     # system.
     #
     def running?
-      if @pid.exists?
+      if @pid.exist?
         return Pid.running?(@pid.pid)
       end
       
@@ -337,4 +338,4 @@ module Daemons
     end
   end
   
-end
+end

data/lib/daemons/application_group.rb

@@ -128,7 +128,7 @@ module Daemons
       
       @applications.each {|a| 
         if force
-          a.stop rescue nil
+          begin; a.stop; rescue ::Exception; end
         else
           a.stop
         end

data/lib/daemons/cmdline.rb

@@ -50,7 +50,18 @@ module Daemons
         end
       end  
       
-      @usage = @opts.to_s  
+      begin
+        @usage = @opts.to_s
+      rescue ::Exception # work around a bug in ruby 1.9
+        @usage = <<END
+            -t, --ontop                      Stay on top (does not daemonize)
+            -f, --force                      Force operation
+
+        Common options:
+            -h, --help                       Show this message
+                --version                    Show version
+END
+      end
     end
     
     

data/lib/daemons/daemonize.rb

@@ -134,7 +134,7 @@ module Daemonize
     # point them somewhere sensible
     # STDOUT/STDERR should go to a logfile
     
-    STDIN.reopen "/dev/null" rescue nil       
+    begin; STDIN.reopen "/dev/null"; rescue ::Exception; end       
   end
   module_function :simulate
   
@@ -242,20 +242,20 @@ module Daemonize
   # point them somewhere sensible
   # STDOUT/STDERR should go to a logfile
   def redirect_io(logfile_name)
-    STDIN.reopen "/dev/null" rescue nil       
+    begin; STDIN.reopen "/dev/null"; rescue ::Exception; end       
      
     if logfile_name
       begin
         STDOUT.reopen logfile_name, "a" 
         STDOUT.sync = true
       rescue ::Exception
-        STDOUT.reopen "/dev/null" rescue nil
+        begin; STDOUT.reopen "/dev/null"; rescue ::Exception; end
       end
     else
-      STDOUT.reopen "/dev/null" rescue nil
+      begin; STDOUT.reopen "/dev/null"; rescue ::Exception; end
     end
     
-    STDERR.reopen STDOUT rescue nil
+    begin; STDERR.reopen STDOUT; rescue ::Exception; end
     STDERR.sync = true
   end
   module_function :redirect_io

data/lib/daemons/monitor.rb

@@ -12,7 +12,7 @@ module Daemons
         pid = PidFile.existing(pid)
         
         unless PidFile.running?(pid.pid)
-          pid.cleanup rescue nil
+          begin; pid.cleanup; rescue ::Exception; end
           return
         end
         
@@ -67,7 +67,7 @@ module Daemons
           @pid.pid = Process.pid
           
   #         at_exit {
-  #           @pid.cleanup rescue nil
+   #          begin; @pid.cleanup; rescue ::Exception; end
   #         }
           
           # This part is needed to remove the pid-file if the application is killed by 
@@ -76,7 +76,7 @@ module Daemons
           # 'TERM'.
           #
   #         trap('TERM') {
-  #           @pid.cleanup rescue nil
+   #          begin; @pid.cleanup; rescue ::Exception; end
   #           exit
   #         }
           
@@ -89,7 +89,7 @@ module Daemons
               f.puts e.backtrace.inspect
             }
           ensure 
-            @pid.cleanup rescue nil
+            begin; @pid.cleanup; rescue ::Exception; end
             exit!
           end
         end
@@ -116,11 +116,11 @@ module Daemons
     
     
     def stop
-      Process.kill('TERM', @pid.pid) rescue nil
+      begin; Process.kill('TERM', @pid.pid); rescue ::Exception; end
       
       # We try to remove the pid-files by ourselves, in case the application
       # didn't clean it up.
-      @pid.cleanup rescue nil
+      begin; @pid.cleanup; rescue ::Exception; end
     end
     
   end

data/lib/daemons/pid.rb

@@ -22,7 +22,9 @@ module Daemons
           break
         }
       ensure
-        ps_in.close rescue nil; ps_out.close rescue nil; ps_err.close rescue nil
+        begin; ps_in.close; rescue ::Exception; end
+        begin; ps_out.close; rescue ::Exception; end
+        begin; ps_err.close; rescue ::Exception; end
       end
       
       # an alternative would be to use the code below, but I don't know whether this is portable
@@ -74,7 +76,7 @@ module Daemons
     end
     
     # Exists? method
-    def exists?
+    def exist?
       true
     end
     

data/lib/daemons/pidfile.rb

@@ -64,13 +64,13 @@ module Daemons
       File.join(@dir, "#{@progname}#{ @number or '' }.pid")
     end
     
-    def exists?
-      File.exists? filename
+    def exist?
+      File.exist? filename
     end
     
     def pid=(p)
       if multiple
-        while File.exists?(filename) and @number < 1024
+        while File.exist?(filename) and @number < 1024
           @number += 1
         end
         

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-01-17 00:00:00 +01:00
+  version: 1.0.5
+date: 2007-02-24 00:00:00 +01:00
 summary: A toolkit to create and control daemons in different ways
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - Releases
 - TODO
 - README
+- LICENSE
 - setup.rb
 - lib/daemons.rb
 - lib/daemons/application.rb
@@ -63,7 +64,6 @@ files:
 - examples/run/ctrl_multiple.rb
 - examples/run/ctrl_normal.rb
 - examples/run/ctrl_ontop.rb
-- examples/run/ctrl_proc.output
 - examples/run/ctrl_proc.rb
 - examples/run/ctrl_proc.rb.output
 - examples/run/ctrl_proc_simple.rb