tracee 1.0.21 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c576fa8d39afe4fd20d6bd8bd6086c017675449
-  data.tar.gz: 51940afeb97ead1889de574564ca155d8b5f21c6
+  metadata.gz: 637958bdfbed8bf417884a99c00948b4543b379e
+  data.tar.gz: 56cabb7bb3afc959fe14a5d0b88eedc38af5f17c
 SHA512:
-  metadata.gz: 799088d59b979a70f904e749b1bdd5469606dca1e7887054c99b76630827726d5f009b6f16d6342a8fb78733eeb03d2c31370e253253dab8e5bf34a7b571e5a1
-  data.tar.gz: 1b618f33803bdd64120a47eaaf03b7f9935677397cab45ff0cbcef6a8e53b3ca015ce86645a2685f5e6c3ec8929b89ae2c584a0094793d624bc977e1c94d8321
+  metadata.gz: 7b2621cd13bd53a06d69c69835f0b5c7989349339b9aae1b1ae1901811c23e8944c8543f709e733efa05ae3bc8f900ca2f16e40709828e5e8e8ec40c0f80bc1a
+  data.tar.gz: 6b87deb90244cc477afb4c34edf3e688a5e9d79905dbca0e74c11310df139ad2421e53413c8372dcc0710bde046132d39bbf461bae25d0513176ee717366a2c5

data/lib/tracee.rb

@@ -61,11 +61,8 @@ module Tracee
     # without side-effects, so we just skip extending.
   else
     # BetterErrors has not yet been loaded or will not be loaded at all.
-    # Check if it's not the version that always freezes on error with the trace decorator.
-    if RUBY_VERSION <= '2.3.1'
-      # Just insert the extension before Exception.
-      ::Exception.prepend Tracee::Extensions::Exception
-    end
+    # Just insert the extension before Exception.
+    ::Exception.prepend Tracee::Extensions::Exception
   end
   ::Exception.send :class_attribute, :trace_decorator
   
@@ -114,6 +111,5 @@ module Tracee
   
   end
   
-  
-  $log ||= Logger.new
+  Logger.new default: true
 end

data/lib/tracee/ext/exception.rb

@@ -6,46 +6,49 @@ module Tracee
         exc_class.send :class_attribute, :trace_decorator
       end
       
-      ## Gotcha:
-      # If you also set (e.g. in irbrc file) 
-      #
-      #   SCRIPT_LINES__['(irb)'] = []
-      #   module Readline
-      #     alias :orig_readline :readline
-      #     def readline(*args)
-      #       ln = orig_readline(*args)
-      #       SCRIPT_LINES__['(irb)'] << "#{ln}\n"
-      #       ln
-      #     end
-      #   end
-      #
-      # it will be possible to fetch lines entered in IRB
-      # else format_trace would only read ordinary require'd files
-      ##
-      if RUBY_VERSION > '2.1'
-        
-        def set_backtrace(trace)
-          if decorator = self.class.trace_decorator
-            if trace.is_a? Thread::Backtrace
-              return trace
-            else
-              trace = decorator.(trace)
+      # Check if it's not the version that always freezes on error with the trace decorator.
+      if RUBY_VERSION <= '2.3.1'
+        ## Gotcha:
+        # If you also set (e.g. in irbrc file) 
+        #
+        #   SCRIPT_LINES__['(irb)'] = []
+        #   module Readline
+        #     alias :orig_readline :readline
+        #     def readline(*args)
+        #       ln = orig_readline(*args)
+        #       SCRIPT_LINES__['(irb)'] << "#{ln}\n"
+        #       ln
+        #     end
+        #   end
+        #
+        # it will be possible to fetch lines entered in IRB
+        # else format_trace would only read ordinary require'd files
+        ##
+        if RUBY_VERSION > '2.1.0'
+          
+          def set_backtrace(trace)
+            if decorator = self.class.trace_decorator
+              if trace.is_a? Thread::Backtrace
+                return trace
+              else
+                trace = decorator.(trace)
+              end
             end
+            
+            super(trace)
           end
           
-          super(trace)
-        end
-        
-      else
-        
-        def set_backtrace(trace)
-          if decorator = self.class.trace_decorator
-            trace = decorator.(trace)
+        else
+          
+          def set_backtrace(trace)
+            if decorator = self.class.trace_decorator
+              trace = decorator.(trace)
+            end
+            
+            super(trace)
           end
           
-          super(trace)
         end
-        
       end
       
       ## Use case: 
@@ -60,9 +63,13 @@ module Tracee
       def log
         Rails.logger.error [
               "The exception has been handled: #{self.class} — #{message.force_encoding('UTF-8')}:",
-              *Rails.backtrace_cleaner.clean(backtrace)
+              *Rails.backtrace_cleaner.clean(backtrace_with_cause_backtrace)
             ]*"\n"
       end
+  
+      def backtrace_with_cause_backtrace
+        backtrace + (cause ? ["+ cause (#{cause.class}) backtrace", *cause.backtrace_with_cause_backtrace] : [])
+      end
           
     end
   end

data/lib/tracee/preprocessors/colorize.rb

@@ -21,7 +21,7 @@ module Tracee::Preprocessors
   
     def call(msg_level, datetime, progname, msg, caller_slice=[])
       case msg
-      when %r{^Started (?<method>[A-Z]+) "(?<path>/[^"]*)" for (?<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) at (?<time>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?: \+\d{4})?)}
+      when %r{^Started (?<method>[A-Z]+) "(?<path>/[^"]*)" for (?<ip>(?:[\d\.]+|[\da-f:]+)) at (?<time>[\d\-]+ [\d:]+(?: \+\d{4})?)}
         m = $~
         %{Started #{m[:method].send @color_map[:head]} "#{m[:path].send @color_map[:head]}" for #{m[:ip].send @color_map[:head]} at #{m[:time].send @color_map[:head]}}
       when %r{^Processing by (?<class>[A-Z][\w:]+)#(?<method>\w+) as (?<format>[A-Z]+)$}

data/lib/tracee/version.rb

@@ -1,3 +1,3 @@
 module Tracee
-  VERSION = '1.0.21'
+  VERSION = '1.0.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracee
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.23
 platform: ruby
 authors:
 - Sergey Baev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler