lib/safely/backtrace.rb in safely-0.3.0 vs lib/safely/backtrace.rb in safely-0.3.1

@@ -14,25 +14,19 @@
         @enabled = false
       end
 
       def log_exceptions
         return unless @enabled && self.trace_directory && File.directory?( self.trace_directory )
+        return if (last_exception = $!).nil?
 
         require 'logger'
 
         trace_file = File.join( self.trace_directory, "backtrace-#{Time.now.strftime('%Y%m%d%H%M%S')}-#{Process.pid}.log" )
         trace_log = Logger.new( trace_file )
 
-        # Find the last exception
-        e = nil
-        ObjectSpace.each_object {|o|
-          if ::Exception === o
-            e = o
-          end
-        }
-
-        trace_log.info "*** Below you'll find the most recent exception thrown, this will likely (but not certainly) be the exception that made #{DaemonKit.configuration.daemon_name} exit abnormally ***"
-        trace_log.error e
+        # Log the last exception
+        trace_log.info "*** Below you'll find the most recent exception thrown, this will likely (but not certainly) be the exception that made your application exit abnormally ***"
+        trace_log.error last_exception
 
         trace_log.info "*** Below you'll find all the exception objects in memory, some of them may have been thrown in your application, others may just be in memory because they are standard exceptions ***"
         ObjectSpace.each_object {|o|
           if ::Exception === o
             trace_log.error o