daemons 1.0.3 → 1.0.4

data/README

@@ -1,4 +1,4 @@
-= Daemons Version 1.0.3
+= Daemons Version 1.0.4
 
 (See Releases for release-specific information)
 
@@ -184,7 +184,7 @@ The RDoc documentation is also online at http://daemons.rubyforge.org
 
 == Author
 
-Written in 2005 by Thomas Uehlinger <mailto:th.uehlinger@gmx.ch>.
+Written in 2005-2007 by Thomas Uehlinger <mailto:th.uehlinger@gmx.ch>.
 Homepage: http://physiker.ch
 
 == License

data/Releases

@@ -1,5 +1,11 @@
 = Daemons Release History
 
+== Release 1.0.4: January 17, 2007
+
+* Document the :log_output option (thanks to Andrew Kuklewicz).
+* Set STDOUT.sync = true when redirecting to a logfile (thanks to Andrew Kuklewicz).
+* Should now run also correctly when there is no working 'ps ax' on the system (thanks to Daniel Kehoe).
+
 == Release 1.0.3: November 1, 2006
 
 * Set the app_name correctly also for the monitor process (thanks to Ilya Novoselov).

data/examples/run/ctrl_proc.rb.output

@@ -4,22 +4,3 @@ 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/lib/daemons.rb

@@ -65,7 +65,7 @@ require 'daemons/controller'
 #
 module Daemons
 
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
   
   require 'daemons/daemonize'
   
@@ -98,13 +98,16 @@ module Daemons
   # <tt>:dir</tt>::       Used in combination with <tt>:dir_mode</tt> (description above)
   # <tt>:multiple</tt>::  Specifies whether multiple instances of the same script are allowed to run at the
   #                       same time
-  # <tt>:ontop</tt>::     When given, stay on top, i.e. do not daemonize the application 
+  # <tt>:ontop</tt>::     When given (i.e. set to true), stay on top, i.e. do not daemonize the application 
   #                       (but the pid-file and other things are written as usual)
   # <tt>:mode</tt>::      <tt>:load</tt> Load the script with <tt>Kernel.load</tt>;
   #                       <tt>:exec</tt> Execute the script file with <tt>Kernel.exec</tt>
   # <tt>:backtrace</tt>:: Write a backtrace of the last exceptions to the file '[app_name].log' in the 
   #                       pid-file directory if the application exits due to an uncaught exception
   # <tt>:monitor</tt>::   Monitor the programs and restart crashed instances
+  # <tt>:log_output</tt>:: When given (i.e. set to true), redirect both STDOUT and STDERR to a logfile 
+  #                       named '[app_name].output' in the pid-file directory
+  #
   # -----
   # 
   # === Example:

data/lib/daemons/daemonize.rb

@@ -187,23 +187,7 @@ module Daemonize
         end
       end
   
-      # Free file descriptors and
-      # point them somewhere sensible
-      # STDOUT/STDERR should go to a logfile
-      
-      STDIN.reopen "/dev/null" rescue nil       
-      
-      if logfile_name
-        begin
-          STDOUT.reopen logfile_name, "a" 
-        rescue ::Exception
-          STDOUT.reopen "/dev/null" rescue nil
-        end
-      else
-        STDOUT.reopen "/dev/null" rescue nil
-      end
-      
-      STDERR.reopen STDOUT rescue nil    
+      redirect_io(logfile_name)  
     
       block.call
       
@@ -246,27 +230,34 @@ module Daemonize
       end
     end
 
-    # Free file descriptors and
-    # point them somewhere sensible
-    # STDOUT/STDERR should go to a logfile
+    redirect_io(logfile_name)
     
+    #return oldmode ? sess_id : 0   # Return value is mostly irrelevant
+    return sess_id
+  end
+  module_function :daemonize
+  
+  
+  # Free file descriptors and
+  # point them somewhere sensible
+  # STDOUT/STDERR should go to a logfile
+  def redirect_io(logfile_name)
     STDIN.reopen "/dev/null" rescue nil       
-    
+     
     if logfile_name
       begin
         STDOUT.reopen logfile_name, "a" 
+        STDOUT.sync = true
       rescue ::Exception
         STDOUT.reopen "/dev/null" rescue nil
       end
     else
       STDOUT.reopen "/dev/null" rescue nil
     end
-     
-    STDERR.reopen STDOUT rescue nil           
     
-    #return oldmode ? sess_id : 0   # Return value is mostly irrelevant
-    return sess_id
+    STDERR.reopen STDOUT rescue nil
+    STDERR.sync = true
   end
-  module_function :daemonize
+  module_function :redirect_io
   
 end

data/lib/daemons/pid.rb

@@ -1,3 +1,5 @@
+require 'open3'
+
 
 module Daemons
 
@@ -6,16 +8,23 @@ module Daemons
     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_all.each { |psline|
-        next unless psline =~ match_pid
-        got_match = true
-        got_match = false if additional and psline !~ /#{additional}/
-        break
-      }
-      ps_all.close
-
+  
+      #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
+        ps_in.close rescue nil; ps_out.close rescue nil; ps_err.close rescue nil
+      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
        

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: daemons
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
-date: 2006-11-02 00:00:00 +01:00
+  version: 1.0.4
+date: 2007-01-17 00:00:00 +01:00
 summary: A toolkit to create and control daemons in different ways
 require_paths: 
 - lib