daemons 1.0.7 → 1.0.8

data/README

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

data/Releases

@@ -1,5 +1,9 @@
 = Daemons Release History
 
+== Release 1.0.8: September 24, 2007
+
+* new Pid.running? function. Checking whether a process exists by sending signal '0' (thanks to Dru Nelson).
+
 == Release 1.0.7: July 7, 2007
 
 * Patch to fix wrong ARGV when using :exec (in def start_exec: Kernel.exec(script(), *(@app_argv || []))) (thanks to Alex McGuire).

data/lib/daemons.rb

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

data/lib/daemons/pid.rb

@@ -1,84 +1,99 @@
-require 'open3'
-
-
-module Daemons
-
-  class Pid
-  
-    def Pid.running?(pid, additional = nil)
-      match_pid = Regexp.new("^\\s*#{pid}\\s")
-      got_match = false
-  
-      #ps_all = IO.popen('ps ax') # the correct syntax is without a dash (-) !
-      ps_in, ps_out, ps_err = Open3.popen3('ps ax') # the correct syntax is without a dash (-) !
-      
-      return true unless ps_out.gets
-      
-      begin
-        ps_out.each { |psline|
-          next unless psline =~ match_pid
-          got_match = true
-          got_match = false if additional and psline !~ /#{additional}/
-          break
-        }
-      ensure
-        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
-      # `ps axo pid=`.split.include? pid.to_s
-       
-      return got_match
-    end
-    
-    
-    # Returns the directory that should be used to write the pid file to
-    # depending on the given mode.
-    # 
-    # Some modes may require an additionaly hint, others may determine 
-    # the directory automatically.
-    #
-    # If no valid directory is found, returns nil.
-    #
-    def Pid.dir(dir_mode, dir, script)
-      # nil script parameter is allowed as long as dir_mode is not :script
-      return nil if dir_mode == :script && script.nil?                         
-      
-      case dir_mode
-        when :normal
-          return File.expand_path(dir)
-        when :script
-          return File.expand_path(File.join(File.dirname(script),dir))
-        when :system  
-          return '/var/run'
-        else
-          raise Error.new("pid file mode '#{dir_mode}' not implemented")
-      end
-    end
-    
-    # Initialization method
-    def initialize
-    end
-    
-    
-    # Get method
-    def pid
-    end
-    
-    # Set method
-    def pid=(p)
-    end
-    
-    # Cleanup method
-    def cleanup
-    end
-    
-    # Exists? method
-    def exist?
-      true
-    end
-    
-  end  
-  
-  
+require 'open3'
+
+
+module Daemons
+
+  class Pid
+  
+    def Pid.running?(pid)
+      # Check if process is in existence
+      # The simplest way to do this is to send signal '0'
+      # (which is a single system call) that doesn't actually
+      # sending a signal
+      begin
+        Process.kill(0, pid)
+        return true
+      rescue Errno::ESRCH
+        return true
+      rescue Errno::EPERM
+        return false
+      end
+    end
+    
+  #  def Pid.running?(pid, additional = nil)
+  #    match_pid = Regexp.new("^\\s*#{pid}\\s")
+  #    got_match = false
+  #
+  #    #ps_all = IO.popen('ps ax') # the correct syntax is without a dash (-) !
+  #    ps_in, ps_out, ps_err = Open3.popen3('ps ax') # the correct syntax is without a dash (-) !
+  #    
+  #    return true unless ps_out.gets
+  #    
+  #    begin
+  #      ps_out.each { |psline|
+  #        next unless psline =~ match_pid
+  #        got_match = true
+  #        got_match = false if additional and psline !~ /#{additional}/
+  #        break
+  #      }
+  #    ensure
+  #      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
+  #    # `ps axo pid=`.split.include? pid.to_s
+  #     
+  #    return got_match
+  #  end
+    
+    
+    # Returns the directory that should be used to write the pid file to
+    # depending on the given mode.
+    # 
+    # Some modes may require an additionaly hint, others may determine 
+    # the directory automatically.
+    #
+    # If no valid directory is found, returns nil.
+    #
+    def Pid.dir(dir_mode, dir, script)
+      # nil script parameter is allowed as long as dir_mode is not :script
+      return nil if dir_mode == :script && script.nil?                         
+      
+      case dir_mode
+        when :normal
+          return File.expand_path(dir)
+        when :script
+          return File.expand_path(File.join(File.dirname(script),dir))
+        when :system  
+          return '/var/run'
+        else
+          raise Error.new("pid file mode '#{dir_mode}' not implemented")
+      end
+    end
+    
+    # Initialization method
+    def initialize
+    end
+    
+    
+    # Get method
+    def pid
+    end
+    
+    # Set method
+    def pid=(p)
+    end
+    
+    # Cleanup method
+    def cleanup
+    end
+    
+    # Exists? method
+    def exist?
+      true
+    end
+    
+  end  
+  
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
-date: 2007-07-07 00:00:00 +02:00
+  version: 1.0.8
+date: 2007-09-24 00:00:00 +02:00
 summary: A toolkit to create and control daemons in different ways
 require_paths: 
 - lib