Change capture to be based on Exception, and improve backtrace printing

ratnikov · Mar 18, 2011 · 2ce9295 · 2ce9295
1 parent 8dba36c
commit 2ce9295
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/main/ruby/jruby/rack/capture.rb b/src/main/ruby/jruby/rack/capture.rb
@@ -5,6 +5,8 @@
 # See the file LICENSE.txt for details.
 #++
 
+require 'jruby'
+
 module JRuby::Rack
   module Capture
     module Base
@@ -37,7 +39,14 @@ def output
 
       def capture
         super
-        output.puts("\n--- Backtrace", *backtrace) if backtrace
+        if backtrace
+          if JRuby.runtime.instance_config.respond_to?(:trace_type)
+            full_trace = JRuby.runtime.instance_config.trace_type.print_backtrace(self)
+          else
+            full_trace = backtrace.join("\n")
+          end
+          output.puts("\n--- Backtrace", full_trace)
+        end
       end
     end
 

diff --git a/src/main/ruby/jruby/rack/core_ext.rb b/src/main/ruby/jruby/rack/core_ext.rb
@@ -7,12 +7,18 @@
 
 require 'jruby/rack/capture'
 
-class StandardError
+def debug?
+  $DEBUG || !ENV['DEBUG'].nil?
+end
+
+class Exception
   include JRuby::Rack::Capture::Base
   include JRuby::Rack::Capture::Exception
+  include JRuby::Rack::Capture::Environment if debug?
   include JRuby::Rack::Capture::RubyGems
   include JRuby::Rack::Capture::Bundler
   include JRuby::Rack::Capture::JRubyRackConfig
+  include JRuby::Rack::Capture::JavaEnvironment if debug?
 end
 
 class LoadError