rack-mini-profiler 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd8393bb0afbc59162f9ece7f63b47218f742127
-  data.tar.gz: 4f29c3a0407eb08c0b5146eea018919dc6620db8
+  metadata.gz: ca3a413c784a90f894e6ae5b6025f9203d161d1f
+  data.tar.gz: 570faec20b83dc6069a7b91fb065835668093ad9
 SHA512:
-  metadata.gz: 0276de7ece6f3f8a70a4ce085ddb36a209385b1e3892c147057d6629922b4ea90e33177fc1093c72c08bf2de156585cff6b95576733c1cc906cf7cd4cd16000f
-  data.tar.gz: f9accaad19036dde64fdacb1c86ddd15892d97e778ce079bd579bdbe78df508b41716fecc17e0b3176887002caef63f6cc9f37c6384f12ecc233bb170a384863
+  metadata.gz: c2c03d9750cfa1411b78993f16303bdb836a81b741cfea22cccc6209df9c506b6cf020cd0c3409fe77c869009fded27316683ded937b02759b990dbc5dde4a27
+  data.tar.gz: ba89510aba2923e06632876f740242325e26ebecd48d231b4fcef03cfe1a1417878eba48c63c0ca7d1e040ba029ff2493afdc0e1ff764be6d91fbb1c2c2abf20

data/Ruby/CHANGELOG

@@ -143,5 +143,10 @@
 	?pp=env and others
   * SOLR xml unescaped by mistake
 
+20-August-2013
+  * 1.29
+  * Bugfix: SOLR patching had an incorrect monkey patch
+  * Implemented exception tracing using TracePoint see pp=trace-exceptions
+
 
 

data/Ruby/lib/mini_profiler/profiler.rb

@@ -267,8 +267,19 @@ module Rack
         }
       end
 
-      status, headers, body = nil
+      trace_exceptions = query_string =~ /pp=trace-exceptions/ && defined? TracePoint
+      status, headers, body, exceptions,trace = nil
+
       start = Time.now
+
+      if trace_exceptions
+        exceptions = []
+        trace = TracePoint.new(:raise) do |tp|
+          exceptions << tp.raised_exception
+        end
+        trace.enable
+      end
+
       begin
 
         # Strip all the caching headers so we don't get 304s back
@@ -279,6 +290,8 @@ module Rack
         status,headers,body = @app.call(env)
         client_settings.write!(headers)
       ensure
+        trace.disable if trace
+
         if backtraces
           done_sampling = true
           sleep 0.001 until quit_sampler
@@ -299,6 +312,11 @@ module Rack
       return [status,headers,body] if skip_it
 
       # we must do this here, otherwise current[:discard] is not being properly treated
+      if trace_exceptions
+        body.close if body.respond_to? :close
+        return dump_exceptions exceptions
+      end
+
       if query_string =~ /pp=env/
         body.close if body.respond_to? :close
         return dump_env env
@@ -327,44 +345,52 @@ module Rack
       @storage.set_unviewed(page_struct['User'], page_struct['Id'])
       @storage.save(page_struct)
 
-      content_type = headers['Content-Type']
       # inject headers, script
-      if content_type && status == 200
-
+      if headers['Content-Type'] && status == 200
         client_settings.write!(headers)
 
-        # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
-        # Rack::ETag has already inserted some nonesense in the chain
-        headers.delete('ETag')
-        headers.delete('Date')
-        headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
-
-        # inject header
-        if headers.is_a? Hash
-          headers['X-MiniProfiler-Ids'] = ids_json(env)
-        end
-
-        if current.inject_js && content_type =~ /text\/html/
-          response = Rack::Response.new([], status, headers)
-          script = self.get_profile_script(env)
-
-          if String === body
-            response.write inject(body,script)
-          else
-            body.each { |fragment| response.write inject(fragment, script) }
-          end
-          body.close if body.respond_to? :close
-          return response.finish
-        end
+        result = inject_profiler(env,status,headers,body)
+        return result if result
       end
 
       client_settings.write!(headers)
       [status, headers, body]
+
     ensure
       # Make sure this always happens
       current = nil
     end
 
+    def inject_profiler(env,status,headers,body)
+      # mini profiler is meddling with stuff, we can not cache cause we will get incorrect data
+      # Rack::ETag has already inserted some nonesense in the chain
+      content_type = headers['Content-Type']
+
+      headers.delete('ETag')
+      headers.delete('Date')
+      headers['Cache-Control'] = 'must-revalidate, private, max-age=0'
+
+      # inject header
+      if headers.is_a? Hash
+        headers['X-MiniProfiler-Ids'] = ids_json(env)
+      end
+
+      if current.inject_js && content_type =~ /text\/html/
+        response = Rack::Response.new([], status, headers)
+        script = self.get_profile_script(env)
+
+        if String === body
+          response.write inject(body,script)
+        else
+          body.each { |fragment| response.write inject(fragment, script) }
+        end
+        body.close if body.respond_to? :close
+        response.finish
+      else
+        nil
+      end
+    end
+
     def inject(fragment, script)
       if fragment.match(/<\/body>/i)
         # explicit </body>
@@ -402,6 +428,16 @@ module Rack
       end
     end
 
+    def dump_exceptions(exceptions)
+      headers = {'Content-Type' => 'text/plain'}
+      body = "Exceptions (#{exceptions.length} raised during request)\n\n"
+      exceptions.each do |e|
+        body << "#{e.class} #{e.message}\n#{e.backtrace.join("\n")}\n\n\n\n"
+      end
+
+      [200, headers, [body]]
+    end
+
     def dump_env(env)
       headers = {'Content-Type' => 'text/plain'}
       body = "Rack Environment\n---------------\n"
@@ -438,6 +474,7 @@ module Rack
   pp=profile-gc: perform gc profiling on this request, analyzes ObjectSpace generated by request (ruby 1.9.3 only)
   pp=profile-gc-time: perform built-in gc profiling on this request (ruby 1.9.3 only)
   pp=flamegraph: works best on Ruby 2.0, a graph representing sampled activity.
+  pp=trace-exceptions: requires Ruby 2.0, will return all the spots where your application raises execptions
 "
 
       client_settings.write!(headers)

data/Ruby/lib/patches/sql_patches.rb

@@ -200,7 +200,7 @@ if SqlPatches.class_exists?("RSolr::Connection") && RSolr::VERSION[0] != "0" #
 
       data = "#{request_context[:method].upcase} #{request_context[:uri]}"
       if request_context[:method] == :post and request_context[:data]
-        if request_context[:headers].include("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
+        if request_context[:headers].include?("Content-Type") and request_context[:headers]["Content-Type"] == "text/xml"
           # it's xml, unescaping isn't needed
           data << "\n#{request_context[:data]}"
         else

data/rack-mini-profiler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
 	s.name = "rack-mini-profiler"
-	s.version = "0.1.28"
+	s.version = "0.1.29"
 	s.summary = "Profiles loading speed for rack applications."
 	s.authors = ["Sam Saffron", "Robin Ward","Aleks Totic"]
 	s.description = "Profiling toolkit for Rack applications with Rails integration. Client Side profiling, DB profiling and Server profiling."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-mini-profiler
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack