daemons 1.1.9 → 1.2.1

data/lib/daemons/application.rb

@@ -2,39 +2,37 @@ require 'daemons/pidfile'
 require 'daemons/pidmem'
 require 'daemons/change_privilege'
 require 'daemons/daemonize'
+require 'daemons/exceptions'
 
 require 'timeout'
 
-
 module Daemons
-
   class Application
-  
     attr_accessor :app_argv
     attr_accessor :controller_argv
-    
+
     # the Pid instance belonging to this application
     attr_reader :pid
-    
+
     # the ApplicationGroup the application belongs to
     attr_reader :group
-    
+
     # my private options
     attr_reader :options
-    
-    
+
     SIGNAL = (RUBY_PLATFORM =~ /win32/ ? 'KILL' : 'TERM')
-    
-    
+
     def initialize(group, add_options = {}, pid = nil)
       @group = group
       @options = group.options.dup
       @options.update(add_options)
-      
+
       @dir_mode = @dir = @script = nil
-      
+
       @force_kill_waittime = @options[:force_kill_waittime] || 20
-      
+
+      @show_status_callback = method(:default_show_status)
+
       unless @pid = pid
         if @options[:no_pidfiles]
           @pid = PidMem.new
@@ -45,21 +43,25 @@ module Daemons
         end
       end
     end
-    
+
+    def show_status_callback=(function)
+      @show_status_callback = method(function)
+    end
+
     def change_privilege
       user = options[:user]
       group = options[:group]
       CurrentProcess.change_privilege(user, group) if user
     end
-    
+
     def script
       @script || @group.script
     end
-    
+
     def pidfile_dir
       Pid.dir(@dir_mode || @group.dir_mode, @dir || @group.dir, @script || @group.script)
     end
-    
+
     def logdir
       logdir = options[:log_dir]
       unless logdir
@@ -67,15 +69,31 @@ module Daemons
       end
       logdir
     end
+
+    def output_logfilename
+      filename = options[:output_logfilename]
+      unless filename
+        filename = @group.app_name + '.output'
+      end
+      filename
+    end
     
     def output_logfile
-      (options[:log_output] && logdir) ? File.join(logdir, @group.app_name + '.output') : nil
+      (options[:log_output] && logdir) ? File.join(logdir, output_logfilename) : nil
+    end
+
+    def logfilename
+      filename = options[:logfilename]
+      unless filename
+        filename = @group.app_name + '.log'
+      end
+      filename
     end
     
     def logfile
-      logdir ? File.join(logdir, @group.app_name + '.log') : nil
+      logdir ? File.join(logdir, logfilename) : nil
     end
-    
+
     # this function is only used to daemonize the currently running process (Daemons.daemonize)
     def start_none
       unless options[:ontop]
@@ -83,163 +101,159 @@ module Daemons
       else
         Daemonize.simulate(output_logfile)
       end
-      
+
       @pid.pid = Process.pid
-      
-      
+
       # We need this to remove the pid-file if the applications exits by itself.
-      # Note that <tt>at_text</tt> will only be run if the applications exits by calling 
+      # Note that <tt>at_text</tt> will only be run if the applications exits by calling
       # <tt>exit</tt>, and not if it calls <tt>exit!</tt> (so please don't call <tt>exit!</tt>
       # in your application!
       #
-      at_exit {
+      at_exit do
         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
-          begin; exception_log(); rescue ::Exception; end
+        if options[:backtrace] && !options[:ontop] && !$daemons_sigterm
+          begin; exception_log; rescue ::Exception; end
         end
-          
-      }
-      
-      # This part is needed to remove the pid-file if the application is killed by 
+
+      end
+
+      # This part is needed to remove the pid-file if the application is killed by
       # daemons or manually by the user.
       # Note that the applications is not supposed to overwrite the signal handler for
       # 'TERM'.
       #
-      trap(SIGNAL) {
+      trap(SIGNAL) do
         begin; @pid.cleanup; rescue ::Exception; end
         $daemons_sigterm = true
-        
+
         if options[:hard_exit]
           exit!
         else
           exit
         end
-      }
+      end
     end
-    
+
     def start_exec
       if options[:backtrace]
-        puts "option :backtrace is not supported with :mode => :exec, ignoring"
+        puts 'option :backtrace is not supported with :mode => :exec, ignoring'
       end
-      
+
       unless options[:ontop]
         Daemonize.daemonize(output_logfile, @group.app_name)
       else
         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')
       @pid.pid = Process.pid
-      
-      ENV['DAEMONS_ARGV'] = @controller_argv.join(' ')      
+
+      ENV['DAEMONS_ARGV'] = @controller_argv.join(' ')
       # haven't tested yet if this is really passed to the exec'd process...
-      
-      started()
-      Kernel.exec(script(), *(@app_argv || []))
+
+      started
+      Kernel.exec(script, *(@app_argv || []))
     end
-    
+
     def start_load
       unless options[:ontop]
         Daemonize.daemonize(output_logfile, @group.app_name)
       else
         Daemonize.simulate(output_logfile)
       end
-      
+
       @pid.pid = Process.pid
-      
-      
+
       # We need this to remove the pid-file if the applications exits by itself.
-      # Note that <tt>at_exit</tt> will only be run if the applications exits by calling 
+      # Note that <tt>at_exit</tt> will only be run if the applications exits by calling
       # <tt>exit</tt>, and not if it calls <tt>exit!</tt> (so please don't call <tt>exit!</tt>
       # in your application!
       #
-      at_exit {
+      at_exit do
         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
-          begin; exception_log(); rescue ::Exception; end
+        if options[:backtrace] && !options[:ontop] && !$daemons_sigterm
+          begin; exception_log; rescue ::Exception; end
         end
-          
-      }
-      
-      # This part is needed to remove the pid-file if the application is killed by 
+
+      end
+
+      # This part is needed to remove the pid-file if the application is killed by
       # daemons or manually by the user.
       # Note that the applications is not supposed to overwrite the signal handler for
       # 'TERM'.
       #
       $daemons_stop_proc = options[:stop_proc]
-      trap(SIGNAL) {
+      trap(SIGNAL) do
         begin
-        if $daemons_stop_proc
-          $daemons_stop_proc.call
-        end
-        rescue ::Exception
+          if $daemons_stop_proc
+            $daemons_stop_proc.call
+          end
+          rescue ::Exception
         end
-        
+
         begin; @pid.cleanup; rescue ::Exception; end
         $daemons_sigterm = true
-        
+
         if options[:hard_exit]
           exit!
         else
           exit
         end
-      }
-      
+      end
+
       # Now we really start the script...
       $DAEMONS_ARGV = @controller_argv
       ENV['DAEMONS_ARGV'] = @controller_argv.join(' ')
-      
+
       ARGV.clear
       ARGV.concat @app_argv if @app_argv
-      
-      started()
+
+      started
       # TODO: begin - rescue - end around this and exception logging
-      load script()
+      load script
     end
-    
+
     def start_proc
       return unless p = options[:proc]
-    
-      myproc = proc do 
-        
-        @pid.pid = Process.pid
-        
+
+      myproc = proc do
+
         # We need this to remove the pid-file if the applications exits by itself.
-        # Note that <tt>at_text</tt> will only be run if the applications exits by calling 
+        # Note that <tt>at_text</tt> will only be run if the applications exits by calling
         # <tt>exit</tt>, and not if it calls <tt>exit!</tt> (so please don't call <tt>exit!</tt>
         # in your application!
         #
-        at_exit {
+        at_exit do
           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
-            begin; exception_log(); rescue ::Exception; end
+          if options[:backtrace] && !options[:ontop] && !$daemons_sigterm
+            begin; exception_log; rescue ::Exception; end
           end
 
-        }
+        end
 
-        # This part is needed to remove the pid-file if the application is killed by 
+        # This part is needed to remove the pid-file if the application is killed by
         # daemons or manually by the user.
         # Note that the applications is not supposed to overwrite the signal handler for
         # 'TERM'.
         #
         $daemons_stop_proc = options[:stop_proc]
-        trap(SIGNAL) {
+        trap(SIGNAL) do
           begin
-          if $daemons_stop_proc
-            $daemons_stop_proc.call
-          end
-          rescue ::Exception
+            if $daemons_stop_proc
+              $daemons_stop_proc.call
+            end
+            rescue ::Exception
           end
-          
+
           begin; @pid.cleanup; rescue ::Exception; end
           $daemons_sigterm = true
 
@@ -248,42 +262,28 @@ module Daemons
           else
             exit
           end
-        }
-        
-        started()
-        
-        p.call()
+        end
+        p.call
       end
-      
+
       unless options[:ontop]
-        Daemonize.call_as_daemon(myproc, output_logfile, @group.app_name)
-        
+        @pid.pid = Daemonize.call_as_daemon(myproc, output_logfile, @group.app_name)
+
       else
         Daemonize.simulate(output_logfile)
-        
+
         myproc.call
-        
-# why did we use this??
-#         Thread.new(&options[:proc])
-
-# why did we use the code below??
-        # unless pid = Process.fork
-        #   @pid.pid = pid
-        #   Daemonize.simulate(logfile)
-        #   options[:proc].call
-        #   exit
-        # else
-        #   Process.detach(@pid.pid)
-        # end
       end
-      
+      started
     end
-    
-    
-    def start
+
+    def start(restart = false)
       change_privilege
-      @group.create_monitor(@group.applications[0] || self) unless options[:ontop]  # we don't monitor applications in the foreground
-      
+
+      unless restart
+        @group.create_monitor(self) unless options[:ontop]  # we don't monitor applications in the foreground
+      end
+
       case options[:mode]
         when :none
           # this is only used to daemonize the currently running process
@@ -298,32 +298,15 @@ module Daemons
           start_load
       end
     end
-    
+
     def started
       if pid = @pid.pid
-        puts "#{self.group.app_name}: process with pid #{pid} started."
+        puts "#{group.app_name}: process with pid #{pid} started."
         STDOUT.flush
       end
     end
-    
-    
-#     def run
-#       if @group.controller.options[:exec]
-#         run_via_exec()
-#       else
-#         run_via_load()
-#       end
-#     end
-#      
-#     def run_via_exec
-#       
-#     end
-#     
-#     def run_via_load
-#       
-#     end
-
-	  def reload
+
+    def reload
       if @pid.pid == 0
         zap
         start
@@ -347,44 +330,43 @@ module Daemons
     #
     def exception_log
       return unless logfile
-      
+
       require 'logger'
-      
+
       l_file = Logger.new(logfile)
-      
+
       # the code below finds the last exception
       e = nil
-      
-      ObjectSpace.each_object {|o|
+
+      ObjectSpace.each_object do |o|
         if ::Exception === o
           e = o
         end
-      }
-     
-      l_file.info "*** below you find the most recent exception thrown, this will be likely (but not certainly) the exception that made the application exit abnormally ***"
+      end
+
+      l_file.info '*** below you find the most recent exception thrown, this will be likely (but not certainly) the exception that made the application exit abnormally ***'
       l_file.error e
-      
-      l_file.info "*** below you find all exception objects found in memory, some of them may have been thrown in your application, others may just be in memory because they are standard exceptions ***"
-      
+
+      l_file.info '*** below you find all exception objects found in memory, some of them may have been thrown in your application, others may just be in memory because they are standard exceptions ***'
+
       # this code logs every exception found in memory
-      ObjectSpace.each_object {|o|
+      ObjectSpace.each_object do |o|
         if ::Exception === o
           l_file.error o
         end
-      }
-      
+      end
+
       l_file.close
     end
-    
-    
+
     def stop(no_wait = false)
-      if not running?
-        self.zap
+      unless running?
+        zap
         return
       end
-      
+
       pid = @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
@@ -393,71 +375,73 @@ module Daemons
         Process.kill(SIGNAL, pid)
       rescue Errno::ESRCH => e
         puts "#{e} #{pid}"
-        puts "deleting pid-file."
+        puts 'deleting pid-file.'
       end
-      
-      if not no_wait
+
+      unless no_wait
         if @force_kill_waittime > 0
-          puts "#{self.group.app_name}: trying to stop process with pid #{pid}..."
+          puts "#{group.app_name}: trying to stop process with pid #{pid}..."
           STDOUT.flush
-          
+
           begin
-            Timeout::timeout(@force_kill_waittime) {
+            Timeout.timeout(@force_kill_waittime, TimeoutError) do
               while Pid.running?(pid)
                 sleep(0.2)
               end
-            }
-          rescue Timeout::Error
-            puts "#{self.group.app_name}: process with pid #{pid} won't stop, we forcefully kill it..."
+            end
+          rescue TimeoutError
+            puts "#{group.app_name}: process with pid #{pid} won't stop, we forcefully kill it..."
             STDOUT.flush
-            
+
             begin
               Process.kill('KILL', pid)
             rescue Errno::ESRCH
             end
-            
+
             begin
-              Timeout::timeout(20) {
+              Timeout.timeout(20, TimeoutError) do
                 while Pid.running?(pid)
                   sleep(1)
                 end
-              }
-            rescue Timeout::Error
-              puts "#{self.group.app_name}: unable to forcefully kill process with pid #{pid}."
+              end
+            rescue TimeoutError
+              puts "#{group.app_name}: unable to forcefully kill process with pid #{pid}."
               STDOUT.flush
             end
           end
         end
-        
-        
+
       end
-      
+
       sleep(0.1)
       unless Pid.running?(pid)
         # We try to remove the pid-files by ourselves, in case the application
         # didn't clean it up.
         begin; @pid.cleanup; rescue ::Exception; end
-        
-        puts "#{self.group.app_name}: process with pid #{pid} successfully stopped."
+
+        puts "#{group.app_name}: process with pid #{pid} successfully stopped."
         STDOUT.flush
       end
-      
     end
-    
+
     def zap
       @pid.cleanup
     end
-    
+
     def zap!
       begin; @pid.cleanup; rescue ::Exception; end
     end
-    
+
     def show_status
-      running = self.running?
-      
-      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 + ')' : ''}"
+      @show_status_callback.call(self)
     end
-    
+
+    def default_show_status(daemon = self)
+      running = daemon.running?
+
+      puts "#{group.app_name}: #{running ? '' : 'not '}running#{(running and daemon.pid.exist?) ? ' [pid ' + daemon.pid.pid.to_s + ']' : ''}#{(daemon.pid.exist? and not running) ? ' (but pid-file exists: ' + daemon.pid.pid.to_s + ')' : ''}"
+    end
+
     # This function implements a (probably too simle) method to detect
     # whether the program with the pid found in the pid-file is still running.
     # It just searches for the pid in the output of <tt>ps ax</tt>, which
@@ -469,9 +453,8 @@ module Daemons
       if @pid.exist?
         return Pid.running?(@pid.pid)
       end
-      
-      return false
+
+      false
     end
   end
-  
 end