daemons 0.4.2 → 0.4.3

data/README

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

data/Releases

@@ -1,5 +1,14 @@
 = Daemons Release History
 
+== Release 0.4.3: November 29, 2005
+
+* New Option: You can specify the name of the application with :app_name
+  on calling Daemons.run. This will be used to contruct the name of the pid files
+  and log files. Defaults to the basename of the script. (thanks to Stephen R. Veit)
+
+* Bugfix: Handle the case where no controller options are given when calling Daemons, 
+  just options after "--". (thanks to Stephen R. Veit)
+
 
 == Release 0.4.2: November 15, 2005
 

data/lib/daemons.rb

@@ -59,7 +59,7 @@ require 'daemons/controller'
 #
 module Daemons
 
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
   
   require 'daemons/daemonize'
   
@@ -79,6 +79,10 @@ module Daemons
   # +options+:: A hash that may contain one or more of the options listed below
   #
   # === Options:
+  # <tt>:app_name</tt>::  The name of the application. This will be
+  #                       used to contruct the name of the pid files
+  #                       and log files. Defaults to the basename of
+  #                       the script.
   # <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 
@@ -99,6 +103,7 @@ module Daemons
   # 
   # === Example:
   #   options = {
+  #     :app_name   => "my_app",
   #     :dir_mode   => :script,
   #     :dir        => 'pids',
   #     :multiple   => true,

data/lib/daemons/application.rb

@@ -248,7 +248,16 @@ module Daemons
         return
       end
       
-      Process.kill('TERM', @pid.pid)
+      # Catch errors when trying to kill a process that doesn't
+      # exist. This happens when the process quits and hasn't been
+      # restarted by the monitor yet. By catching the error, we allow the
+      # pid file clean-up to occur.
+      begin
+        Process.kill('TERM', @pid.pid)
+      rescue Errno::ESRCH => e
+        puts "#{e} #{@pid.pid}"
+        puts "deleting pid-file."
+      end
       
       # We try to remove the pid-files by ourselves, in case the application
       # didn't clean it up.

data/lib/daemons/controller.rb

@@ -22,10 +22,14 @@ module Daemons
       @options = options
       @argv = argv
       
+      # Allow an app_name to be specified. If not specified use the
+      # basename of the script.
+      @app_name = options[:app_name]
+      
       if options[:script]
         @script = File.expand_path(options[:script])
     
-        @app_name = File.split(@script)[1]
+        @app_name ||= File.split(@script)[1]
       end
     
       @command, @controller_part, @app_part = Controller.split_argv(argv)
@@ -113,7 +117,9 @@ module Daemons
       end
       
       if i = argv.index('--')
-        controller_part = argv[0..i-1]
+        # Handle the case where no controller options are given, just
+        # options after "--" as well (i == 0)
+        controller_part = (i == 0 ? [] : argv[0..i-1])
         app_part = argv[i+1..-1]
       else
         controller_part = argv[0..-1]

metadata

@@ -1,86 +1,84 @@
---- !ruby/object:Gem::Specification 
+!ruby/object:Gem::Specification 
 rubygems_version: 0.8.11
 specification_version: 1
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2005-11-15 00:00:00 +01:00
+  version: 0.4.3
+date: 2005-11-29 00:00:00 +01:00
 summary: A toolkit to create and control daemons in different ways
 require_paths: 
-  - lib
+- lib
 email: th.uehlinger@gmx.ch
 homepage: http://daemons.rubyforge.org
 rubyforge_project: daemons
-description: "Daemons provides an easy way to wrap existing ruby scripts (for example a
-  self-written server)  to be run as a daemon and to be controlled by simple
-  start/stop/restart commands.  You can also call blocks as daemons and control
-  them from the parent or just daemonize the current process.  Besides this basic
-  functionality, daemons offers many advanced features like exception  backtracing
-  and logging (in case your ruby script crashes) and monitoring and automatic
-  restarting of your processes if they crash."
+description: Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server)  to be run as a daemon and to be controlled by simple start/stop/restart commands.  You can also call blocks as daemons and control them from the parent or just daemonize the current process.  Besides this basic functionality, daemons offers many advanced features like exception  backtracing and logging (in case your ruby script crashes) and monitoring and automatic restarting of your processes if they crash.
 autorequire: daemons
 default_executable: 
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Thomas Uehlinger
+- Thomas Uehlinger
 files: 
-  - Rakefile
-  - Releases
-  - TODO
-  - README
-  - setup.rb
-  - lib/daemons.rb
-  - lib/daemons/cmdline.rb
-  - lib/daemons/exceptions.rb
-  - lib/daemons/daemonize.rb
-  - lib/daemons/pidfile.rb
-  - lib/daemons/monitor.rb
-  - lib/daemons/application_group.rb
-  - lib/daemons/controller.rb
-  - lib/daemons/pid.rb
-  - lib/daemons/pidmem.rb
-  - lib/daemons/application.rb
-  - test/tmp
-  - test/testapp.rb
-  - test/test1.rb
-  - test/call_as_daemon.rb
-  - test/tc_main.rb
-  - examples/run
-  - examples/call
-  - examples/daemonize
-  - examples/run/ctrl_exec.rb
-  - examples/run/ctrl_exit.rb
-  - examples/run/ctrl_multiple.rb
-  - examples/run/myserver_crashing.rb.output
-  - examples/run/ctrl_normal.rb
-  - examples/run/ctrl_monitor.rb
-  - examples/run/myserver.rb
-  - examples/run/myserver_crashing.rb
-  - examples/run/ctrl_ontop.rb
-  - examples/run/myserver_exiting.rb
-  - examples/run/ctrl_crash.rb
-  - examples/call/call_monitor.rb
-  - examples/call/call.rb
-  - examples/daemonize/daemonize.rb
+- Rakefile
+- Releases
+- TODO
+- README
+- setup.rb
+- lib/daemons.rb
+- lib/daemons/cmdline.rb
+- lib/daemons/exceptions.rb
+- lib/daemons/daemonize.rb
+- lib/daemons/pidfile.rb
+- lib/daemons/monitor.rb
+- lib/daemons/application_group.rb
+- lib/daemons/controller.rb
+- lib/daemons/pid.rb
+- lib/daemons/pidmem.rb
+- lib/daemons/application.rb
+- test/tmp
+- test/testapp.rb
+- test/test1.rb
+- test/call_as_daemon.rb
+- test/tc_main.rb
+- examples/run
+- examples/call
+- examples/daemonize
+- examples/run/ctrl_exec.rb
+- examples/run/ctrl_exit.rb
+- examples/run/ctrl_multiple.rb
+- examples/run/myserver_crashing.rb.output
+- examples/run/ctrl_normal.rb
+- examples/run/ctrl_monitor.rb
+- examples/run/myserver.rb
+- examples/run/myserver_crashing.rb
+- examples/run/ctrl_ontop.rb
+- examples/run/myserver_exiting.rb
+- examples/run/ctrl_crash.rb
+- examples/call/call_monitor.rb
+- examples/call/call.rb
+- examples/daemonize/daemonize.rb
 test_files: 
-  - test/tc_main.rb
+- test/tc_main.rb
 rdoc_options: []
+
 extra_rdoc_files: 
-  - README
-  - Releases
-  - TODO
+- README
+- Releases
+- TODO
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+