senotrusov-ruby-process-controller 1.0.2 → 1.0.3

data/lib/ruby-process-controller/process_controller.rb

@@ -180,15 +180,15 @@ class ProcessController
         if is_running? running_pid
           raise "#{@name}: already running with pid #{running_pid}"
         else
-          log(:warn, "#{self.class}#initialize @name:`#{@name}' -- Found pidfile:`#{@pid_file}' with pid:`#{running_pid}' and is not running, it may be result of an unclean shutdown.")
+          log(:warn){"#{self.class}#initialize @name:`#{@name}' -- Found pidfile:`#{@pid_file}' with pid:`#{running_pid}' and is not running, it may be result of an unclean shutdown."}
         end
       end
 
-      @logger.info "#{self.class}#initialize @name:`#{@name}' -- Creating process..."
+      @logger.info {"#{self.class}#initialize @name:`#{@name}' -- Creating process..."}
       
       @daemon = yield(self)
       
-      @logger.info "#{self.class}#initialize @name:`#{@name}' -- Process initialized."
+      @logger.info {"#{self.class}#initialize @name:`#{@name}' -- Process initialized."}
     end
     
     if @argv["help"]
@@ -206,7 +206,7 @@ class ProcessController
     
   rescue Exception => exception
     begin
-      log(:fatal, "#{self.class}#initialize @name:`#{@name}' -- #{exception.inspect_with_backtrace}") if @log_file != STDOUT
+      log(:fatal){"#{self.class}#initialize @name:`#{@name}' -- #{exception.inspect_with_backtrace}"} if @log_file != STDOUT
       
       unless @detached
         @argv.errors << exception.inspect_with_backtrace
@@ -240,7 +240,7 @@ class ProcessController
   end
   
   def execute_run
-    @logger.info "#{self.class}#execute_run @name:`#{@name}' -- Starting..."
+    @logger.info {"#{self.class}#execute_run @name:`#{@name}' -- Starting..."}
     
     create_pid  
     
@@ -254,7 +254,7 @@ class ProcessController
   ensure
     untrap_signals
     delete_pid
-    @logger.info "#{self.class}#execute_run @name:`#{@name}' -- Stopped"
+    @logger.info {"#{self.class}#execute_run @name:`#{@name}' -- Stopped"}
   end
   
   def daemon_start_sequence
@@ -275,7 +275,7 @@ class ProcessController
       @daemon.start
     end
   rescue Exception => exception
-    log(:fatal, "#{self.class}#start_daemon @name:`#{@name}' -- #{exception.inspect_with_backtrace}")
+    log(:fatal){"#{self.class}#start_daemon @name:`#{@name}' -- #{exception.inspect_with_backtrace}"}
     stop_daemon
   end
   
@@ -283,7 +283,7 @@ class ProcessController
   def join_daemon
     @daemon.join if @daemon.respond_to?(:join) && @daemon_started_to_some_extent
   rescue Exception => exception
-    log(:fatal, "#{self.class}#join_daemon @name:`#{@name}' -- #{exception.inspect_with_backtrace}")
+    log(:fatal){"#{self.class}#join_daemon @name:`#{@name}' -- #{exception.inspect_with_backtrace}"}
   end
   
   
@@ -292,7 +292,7 @@ class ProcessController
       @daemon.before_exit if @daemon.respond_to?(:before_exit) && @daemon_started_to_some_extent
     end
   rescue Exception => exception
-    log(:fatal, "#{self.class}#before_exit_daemon_handler @name:`#{@name}' -- #{exception.inspect_with_backtrace}")
+    log(:fatal){"#{self.class}#before_exit_daemon_handler @name:`#{@name}' -- #{exception.inspect_with_backtrace}"}
   end
   
   
@@ -383,7 +383,7 @@ class ProcessController
   def stop_thread
     Thread.new_with_exception_handling(lambda { Process.exit!(FAILURE_EXIT_CODES[:stop_thread]) }, @logger, :fatal, "#{self.class}#stop_thread") do
       Thread.stop
-      @logger.debug("#{self.class}#stop_thread @name:`#{@name}' -- Stopping...")
+      @logger.debug {"#{self.class}#stop_thread @name:`#{@name}' -- Stopping..."}
       @daemon_mutex.synchronize do
         @must_terminate = true
         @daemon.stop if @daemon_started_to_some_extent
@@ -395,14 +395,14 @@ class ProcessController
     stop_daemon
   rescue Exception => exception
     begin
-      log(:fatal, "#{self.class}#dispatch_termination_signal @name:`#{@name}' -- Error while stopping: #{exception.inspect_with_backtrace}")
+      log(:fatal){"#{self.class}#dispatch_termination_signal @name:`#{@name}' -- Error while stopping: #{exception.inspect_with_backtrace}"}
     ensure
       Process.exit!(FAILURE_EXIT_CODES[:dispatch_termination_signal])
     end
   end
   
   def stop_daemon
-    log(:info, "\n#{self.class}#stop_daemon @name:`#{@name}' -- Stopping...")
+    log(:info) {"\n#{self.class}#stop_daemon @name:`#{@name}' -- Stopping..."} 
 
     if @termination_watchdog
       begin
@@ -476,9 +476,9 @@ class ProcessController
 
   # LOGGING
 
-  def log severity, message
+  def log severity, &block
     if defined?(@logger)
-      @logger.__send__(severity, message)
+      @logger.__send__(severity, &block)
       @logger.flush if @logger.respond_to?(:flush)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: senotrusov-ruby-process-controller
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Stanislav Senotrusov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-02 00:00:00 -07:00
+date: 2009-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency