daemons 1.0.5 → 1.0.6

data/README

@@ -1,4 +1,4 @@
-= Daemons Version 1.0.5
+= Daemons Version 1.0.6
 
 (See Releases for release-specific information)
 

data/Releases

@@ -1,8 +1,13 @@
 = Daemons Release History
 
+== Release 1.0.6: Mai 8, 2007
+
+* New option to pass an ARGV-style array to run and run_proc (thanks to Marc Evans).
+* Additional patches for '/var/log' (thanks to Marc Evans).
+
 == Release 1.0.5: February 24, 2007
 
-* Applied patch that causes daemons to use '/var/log' as logfile 
+* Applied patch that makes 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).
 

data/examples/call/call.rb

@@ -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 and the options will be kept within, so you only have to specify
+# will be created an the options will be kept within, so you only have to specify
 # <tt>:multiple</tt> once.
 #
 

data/examples/run/ctrl_optionparser.rb

@@ -0,0 +1,43 @@
+lib_dir = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+
+if File.exist?(File.join(lib_dir, 'daemons.rb'))
+  $LOAD_PATH.unshift lib_dir
+else
+  begin; require 'rubygems'; rescue ::Exception; end
+end
+
+require 'daemons'
+require 'optparse'
+require 'logger'
+require 'ostruct'
+
+
+class MyApp < Logger::Application
+  def initialize(args)
+    super(self.class)
+    @options = OpenStruct.new(:daemonize => true)
+    opts = OptionParser.new do |opts|
+      opts.banner = 'Usage: myapp [options]'
+      opts.separator ''
+      opts.on('-N','--no-daemonize',"Don't run as a daemon") do
+        @options.daemonize = false
+      end
+    end
+    @args = opts.parse!(args)
+  end
+  
+  def run
+    Daemons.run_proc('myapp',{:ARGV => @args, :ontop => !@options.daemonize}) do
+      puts "@options.daemonize: #{@options.daemonize}"
+      STDOUT.sync = true
+      loop do
+        print '.'
+        sleep(2)
+      end
+    end
+  end
+end
+
+
+myapp = MyApp.new(ARGV)
+myapp.run

data/lib/daemons.rb

@@ -65,7 +65,7 @@ require 'daemons/controller'
 #
 module Daemons
 
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
   
   require 'daemons/daemonize'
   
@@ -89,6 +89,8 @@ module Daemons
   #                       used to contruct the name of the pid files
   #                       and log files. Defaults to the basename of
   #                       the script.
+  # <tt>:ARGV</tt>::      An array of strings containing parameters and switches for Daemons.
+  #                       If not given, ARGV (the parameters given to the Ruby process) will be used.
   # <tt>:dir_mode</tt>::  Either <tt>:script</tt> (the directory for writing the pid files to 
   #                       given by <tt>:dir</tt> is interpreted relative
   #                       to the script location given by +script+) or <tt>:normal</tt> (the directory given by 
@@ -113,6 +115,7 @@ module Daemons
   # === Example:
   #   options = {
   #     :app_name   => "my_app",
+  #     :ARGV       => ['start', '-f']
   #     :dir_mode   => :script,
   #     :dir        => 'pids',
   #     :multiple   => true,
@@ -127,7 +130,7 @@ module Daemons
   #
   def run(script, options = {})
     options[:script] = script
-    @controller = Controller.new(options, ARGV)
+    @controller = Controller.new(options, options[:ARGV] || ARGV)
     
     @controller.catch_exceptions {
       @controller.run
@@ -176,7 +179,7 @@ module Daemons
       options[:dir] = File.expand_path('.')
     end
     
-    @controller = Controller.new(options, ARGV)
+    @controller = Controller.new(options, options[:ARGV] || ARGV)
     
     @controller.catch_exceptions {
       @controller.run

data/lib/daemons/application.rb

@@ -24,6 +24,8 @@ module Daemons
       @options = group.options.dup
       @options.update(add_options)
       
+      @dir_mode = @dir = @script = nil
+      
       unless @pid = pid
         if dir = pidfile_dir
           @pid = PidFile.new(dir, @group.app_name, @group.multiple)
@@ -41,11 +43,15 @@ module Daemons
       Pid.dir(@dir_mode || @group.dir_mode, @dir || @group.dir, @script || @group.script)
     end
     
-    def logfile
+    def output_logfile
       logdir = options[:dir_mode] == :system ? '/var/log' : pidfile_dir
       (options[:log_output] && logdir) ? File.join(logdir, @group.app_name + '.output') : nil
     end
     
+    def logfile
+      logdir = options[:dir_mode] == :system ? '/var/log' : pidfile_dir
+      logdir ? File.join(logdir, @group.app_name + '.log') : nil
+    end
     
     # this function is only used to daemonize the currently running process (Daemons.daemonize)
     def start_none
@@ -89,9 +95,9 @@ module Daemons
     
     def start_exec
       unless options[:ontop]
-        Daemonize.daemonize(logfile, @group.app_name)
+        Daemonize.daemonize(output_logfile, @group.app_name)
       else
-        Daemonize.simulate(logfile)
+        Daemonize.simulate(output_logfile)
       end
       
       # note that we cannot remove the pid file if we run in :ontop mode (i.e. 'ruby ctrl_exec.rb run')
@@ -105,9 +111,9 @@ module Daemons
     
     def start_load
       unless options[:ontop]
-        Daemonize.daemonize(logfile, @group.app_name)
+        Daemonize.daemonize(output_logfile, @group.app_name)
       else
-        Daemonize.simulate(logfile)
+        Daemonize.simulate(output_logfile)
       end
       
       @pid.pid = Process.pid
@@ -188,9 +194,9 @@ module Daemons
       end
       
       unless options[:ontop]
-        @pid.pid = Daemonize.call_as_daemon(myproc, logfile, @group.app_name)
+        @pid.pid = Daemonize.call_as_daemon(myproc, output_logfile, @group.app_name)
       else
-        Daemonize.simulate(logfile)
+        Daemonize.simulate(output_logfile)
         
         @pid.pid = Process.pid
         
@@ -257,10 +263,11 @@ module Daemons
     # (if it is connected) and to a log file in the pid-file directory.
     #
     def exception_log
-      require 'logger'
+      return unless logfile
       
-      l_file = Logger.new(File.join(pidfile_dir(), @group.app_name + '.log'))
+      require 'logger'
       
+      l_file = Logger.new(logfile)
       
       # the code below only logs the last exception
 #       e = nil
@@ -338,4 +345,4 @@ module Daemons
     end
   end
   
-end
+end

data/lib/daemons/monitor.rb

@@ -28,13 +28,14 @@ module Daemons
     
     
     def initialize(an_app)
+      @app = an_app
+      @app_name = an_app.group.app_name + '_monitor'
+      
       if an_app.pidfile_dir
-        @pid = PidFile.new(an_app.pidfile_dir, an_app.group.app_name + '_monitor', false)
+        @pid = PidFile.new(an_app.pidfile_dir, @app_name, false)
       else
         @pid = PidMem.new
       end
-      
-      @app_name = an_app.group.app_name + '_monitor'
     end
     
     def watch(applications)
@@ -67,7 +68,7 @@ module Daemons
           @pid.pid = Process.pid
           
   #         at_exit {
-   #          begin; @pid.cleanup; rescue ::Exception; end
+  # begin; @pid.cleanup; rescue ::Exception; end
   #         }
           
           # This part is needed to remove the pid-file if the application is killed by 
@@ -76,14 +77,14 @@ module Daemons
           # 'TERM'.
           #
   #         trap('TERM') {
-   #          begin; @pid.cleanup; rescue ::Exception; end
+  # begin; @pid.cleanup; rescue ::Exception; end
   #           exit
   #         }
           
           watch(applications)
         rescue ::Exception => e
           begin
-            File.open(File.join(@pid.dir, @pid.progname + '.log'), 'a') {|f|
+            File.open(@app.logfile, 'a') {|f|
               f.puts Time.now
               f.puts e
               f.puts e.backtrace.inspect
@@ -103,7 +104,6 @@ module Daemons
     private :start_without_pidfile
     
     
-    
     def start(applications)
       return if applications.empty?
       
@@ -123,6 +123,5 @@ module Daemons
       begin; @pid.cleanup; rescue ::Exception; end
     end
     
-  end
-  
+  end 
 end

data/lib/daemons/pid.rb

@@ -22,9 +22,7 @@ module Daemons
           break
         }
       ensure
-        begin; ps_in.close; rescue ::Exception; end
-        begin; ps_out.close; rescue ::Exception; end
-        begin; ps_err.close; rescue ::Exception; end
+        begin; begin; ps_in.close; rescue ::Exception; end; ps_out.close rescue nil; 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

data/lib/daemons/pidfile.rb

@@ -57,6 +57,7 @@ module Daemons
       @dir = File.expand_path(dir)
       @progname = progname
       @multiple = multiple
+      @number = nil
       @number = 0 if multiple
     end
     

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
-date: 2007-02-24 00:00:00 +01:00
+  version: 1.0.6
+date: 2007-05-08 00:00:00 +02:00
 summary: A toolkit to create and control daemons in different ways
 require_paths: 
 - lib
@@ -35,7 +35,6 @@ files:
 - README
 - LICENSE
 - setup.rb
-- lib/daemons.rb
 - lib/daemons/application.rb
 - lib/daemons/application_group.rb
 - lib/daemons/cmdline.rb
@@ -46,17 +45,18 @@ files:
 - lib/daemons/pid.rb
 - lib/daemons/pidfile.rb
 - lib/daemons/pidmem.rb
+- lib/daemons.rb
 - test/call_as_daemon.rb
 - test/tc_main.rb
 - test/test1.rb
 - test/testapp.rb
 - test/tmp
 - examples/call
-- examples/daemonize
-- examples/run
 - examples/call/call.rb
 - examples/call/call_monitor.rb
+- examples/daemonize
 - examples/daemonize/daemonize.rb
+- examples/run
 - examples/run/ctrl_crash.rb
 - examples/run/ctrl_exec.rb
 - examples/run/ctrl_exit.rb
@@ -64,12 +64,11 @@ files:
 - examples/run/ctrl_multiple.rb
 - examples/run/ctrl_normal.rb
 - examples/run/ctrl_ontop.rb
+- examples/run/ctrl_optionparser.rb
 - examples/run/ctrl_proc.rb
-- examples/run/ctrl_proc.rb.output
 - examples/run/ctrl_proc_simple.rb
 - examples/run/myserver.rb
 - examples/run/myserver_crashing.rb
-- examples/run/myserver_crashing.rb.output
 - examples/run/myserver_exiting.rb
 test_files: 
 - test/tc_main.rb

data/examples/run/ctrl_proc.rb.output

@@ -1,101 +0,0 @@
-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!
-ping from proc!
-ping from proc!

data/examples/run/myserver_crashing.rb.output

@@ -1,15 +0,0 @@
-/home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:13: CRASH! (RuntimeError)
-	from /home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:6:in `loop'
-	from /home/uehli/Desktop/daemons-current/examples/myserver_crashing.rb:6
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:116:in `load'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:116:in `run_via_load'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:90:in `start'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:359:in `run'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:469:in `run'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:468:in `call'
-	from /home/uehli/Desktop/daemons-current/lib/daemons/cmdline.rb:94:in `catch_exceptions'
-	from /home/uehli/Desktop/daemons-current/lib/daemons.rb:468:in `run'
-	from ctrl_crash.rb:17
-ping from myserver.rb!
-this example server will crash in 3 seconds...
-CRASH!