rack-bug 0.2.1 → 0.3.0

data/lib/rack/bug/panels/redis_panel/redis_extension.rb

@@ -4,11 +4,11 @@ if defined?(Redis)
   Redis.class_eval do
 
     def call_command_with_rack_bug(argv)
-      Rack::Bug::RedisPanel.record(argv) do
+      Rack::Bug::RedisPanel.record(argv, Kernel.caller) do
         call_command_without_rack_bug(argv)
       end
     end
-  
+
     alias_method_chain :call_command, :rack_bug
   end
-end
+end

data/lib/rack/bug/panels/redis_panel/stats.rb

@@ -1,48 +1,52 @@
 module Rack
   module Bug
     class RedisPanel
-      
+
       class Stats
         class Query
+          include Rack::Bug::FilteredBacktrace
+
           attr_reader :time
           attr_reader :command
-          
-          def initialize(time, *command_args)
+
+          def initialize(time, command_args, backtrace)
             @time = time
             @command = command_args.inspect
+            @backtrace = backtrace
           end
-          
+
           def display_time
             "%.2fms" % time
           end
         end
-        
+
         attr_reader :calls
         attr_reader :queries
-        
+
         def initialize
           @queries = []
           @calls = 0
           @time = 0.0
         end
-        
-        def record_call(time, *command_args)
-          @queries << Query.new(time, command_args)
+
+        def record_call(time, command_args, backtrace)
+          @queries << Query.new(time, command_args, backtrace)
           @calls += 1
           @time += time
         end
-        
+
         def display_time
           "%.2fms" % time
         end
-        
+
         def time
           @queries.inject(0) do |memo, query|
             memo + query.time
           end
         end
+
       end
-      
+
     end
   end
-end
+end

data/lib/rack/bug/panels/request_variables_panel.rb

@@ -1,25 +1,25 @@
 module Rack
   module Bug
-    
+
     class RequestVariablesPanel < Panel
-      
+
       def name
         "request_variables"
       end
-      
+
       def before(env)
         @env = env
       end
-      
+
       def heading
         "Rack Env"
       end
-      
+
       def content
         render_template "panels/request_variables", :request => @request, :env => @env
       end
 
     end
-    
+
   end
-end
+end

data/lib/rack/bug/panels/sphinx_panel.rb

@@ -0,0 +1,44 @@
+module Rack
+  module Bug
+
+    class SphinxPanel < Panel
+      require "rack/bug/panels/sphinx_panel/sphinx_extension"
+
+      autoload :Stats, "rack/bug/panels/sphinx_panel/stats"
+
+      def self.record(*sphinx_command_args, &block)
+        return block.call unless Rack::Bug.enabled?
+
+        start_time = Time.now
+        result = block.call
+        total_time = Time.now - start_time
+        stats.record_call(total_time * 1_000, sphinx_command_args)
+        return result
+      end
+
+      def self.reset
+        Thread.current["rack.bug.sphinx"] = Stats.new
+      end
+
+      def self.stats
+        Thread.current["rack.bug.sphinx"] ||= Stats.new
+      end
+
+      def name
+        "sphinx"
+      end
+
+      def heading
+        "Sphinx: %.2fms (#{self.class.stats.queries.size} calls)" % self.class.stats.time
+      end
+
+      def content
+        result = render_template "panels/sphinx", :stats => self.class.stats
+        self.class.reset
+        return result
+      end
+
+    end
+
+  end
+end

data/lib/rack/bug/panels/sphinx_panel/sphinx_extension.rb

@@ -0,0 +1,13 @@
+require 'riddle'
+
+if defined?(Riddle)
+  Riddle::Client.class_eval do
+    def request_with_rack_bug(command, messages)
+      Rack::Bug::SphinxPanel.record(command, messages) do
+        request_without_rack_bug(command, messages)
+      end
+    end
+
+    alias_method_chain :request, :rack_bug
+  end
+end

data/lib/rack/bug/panels/sphinx_panel/stats.rb

@@ -0,0 +1,96 @@
+module Rack
+  module Bug
+    class SphinxPanel
+
+      class Stats
+        class Query
+          attr_reader :time
+          attr_reader :command
+
+          def initialize(time, *command_args)
+            @time = time
+            if command_args.flatten.first == :search
+              @command = "search: " + decode_message(command_args.first.flatten.last).collect{|k,v| "#{k} => #{v}"}.join(", ")
+            else
+              @command = command_args.flatten.first.to_s + ": No more info is available for this Riddle request type"
+            end
+          end
+
+          def display_time
+            "%.2fms" % time
+          end
+
+          def decode_message(m)
+            @m = m.clone
+            params = ActiveSupport::OrderedHash.new
+
+            params[:offset] = consume_int
+            params[:limit] = consume_int
+            params[:match_mode] = consume_int
+            params[:rank_mode] = consume_int
+            params[:sort_mode] = consume_int
+            params[:sort_by] = consume_string
+            params[:query] = consume_string
+            wl = consume_int
+            weights = []
+            wl.times do weights << consume_int end
+            params[:weights] = weights
+
+            params[:index] = consume_string
+
+            consume_string
+
+            params[:id_range] = [consume_64int, consume_64int]
+            params
+          end
+
+          def consume_int
+            i = @m.unpack("N").first
+            @m = @m.slice(4, @m.length - 4)
+            i
+          end
+
+          def consume_64int
+            i = @m.unpack("NN").first
+            @m = @m.slice(8, @m.length - 8)
+            i
+          end
+
+          def consume_string
+            len = consume_int
+            s = @m.slice(0, len)
+            @m = @m.slice(len, @m.length - len)
+            s
+          end
+        end
+
+        attr_reader :calls
+        attr_reader :queries
+
+        def initialize
+          @queries = []
+          @calls = 0
+          @time = 0.0
+        end
+
+        def record_call(time, *command_args)
+
+          @queries << Query.new(time, command_args)
+          @calls += 1
+          @time += time
+        end
+
+        def display_time
+          "%.2fms" % time
+        end
+
+        def time
+          @queries.inject(0) do |memo, query|
+            memo + query.time
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/rack/bug/panels/sql_panel.rb

@@ -52,4 +52,4 @@ module Rack
     end
 
   end
-end
+end

data/lib/rack/bug/panels/sql_panel/panel_app.rb

@@ -1,9 +1,9 @@
 module Rack
   module Bug
     class SQLPanel
-      
+
       class PanelApp < ::Rack::Bug::PanelApp
-  
+
         def dispatch
           case request.path_info
           when "/__rack_bug__/explain_sql" then explain_sql
@@ -12,26 +12,26 @@ module Rack
           else not_found
           end
         end
-        
+
         def explain_sql
           validate_params
           query = Query.new(params["query"], params["time"].to_f)
           render_template "panels/explain_sql", :result => query.explain, :query => query.sql, :time => query.time
         end
-  
+
         def profile_sql
           validate_params
           query = Query.new(params["query"], params["time"].to_f)
           render_template "panels/profile_sql", :result => query.profile, :query => query.sql, :time => query.time
         end
-  
+
         def execute_sql
           validate_params
           query = Query.new(params["query"], params["time"].to_f)
           render_template "panels/execute_sql", :result => query.execute, :query => query.sql, :time => query.time
         end
-        
+
       end
     end
   end
-end
+end

data/lib/rack/bug/panels/sql_panel/query.rb

@@ -1,18 +1,19 @@
 module Rack
   module Bug
     class SQLPanel
-      
+
       class Query
+        include Rack::Bug::FilteredBacktrace
+
         attr_reader :sql
         attr_reader :time
-        attr_reader :backtrace
-        
+
         def initialize(sql, time, backtrace = [])
           @sql = sql
           @time = time
           @backtrace = backtrace
         end
-        
+
         def human_time
           "%.2fms" % (@time * 1_000)
         end
@@ -20,18 +21,18 @@ module Rack
         def inspectable?
           sql.strip =~ /^SELECT /i
         end
-        
+
         def with_profiling
           self.class.execute("SET PROFILING=1")
           result = yield
           self.class.execute("SET PROFILING=0")
           return result
         end
-        
+
         def explain
           self.class.execute "EXPLAIN #{@sql}"
         end
-        
+
         def profile
           with_profiling do
             execute
@@ -42,32 +43,21 @@ module Rack
             SQL
           end
         end
-        
+
         def execute
           self.class.execute(@sql)
         end
-        
+
         def valid_hash?(secret_key, possible_hash)
           hash = Digest::SHA1.hexdigest [secret_key, @sql].join(":")
           possible_hash == hash
         end
-        
+
         def self.execute(sql)
           ActiveRecord::Base.connection.execute(sql)
         end
-        
-        def has_backtrace?
-          filtered_backtrace.any?
-        end
-        
-        def filtered_backtrace
-          @filtered_backtrace ||= @backtrace.map { |l| l.to_s.strip }.select do |line|
-            line.starts_with?(Rails.root) &&
-            !line.starts_with?(Rails.root.join("vendor"))
-          end
-        end
       end
-      
+
     end
   end
-end
+end

data/lib/rack/bug/panels/sql_panel/sql_extension.rb

@@ -5,7 +5,7 @@ if defined?(ActiveRecord) &&  defined?(ActiveRecord::ConnectionAdapters)
         log_without_rack_bug(sql, name, &block)
       end
     end
-    
+
     alias_method_chain :log, :rack_bug
   end
-end
+end

data/lib/rack/bug/panels/templates_panel.rb

@@ -41,4 +41,4 @@ module Rack
     end
 
   end
-end
+end

data/lib/rack/bug/panels/templates_panel/actionview_extension.rb

@@ -9,4 +9,4 @@ if defined?(ActionView) && defined?(ActionView::Template)
 
     alias_method_chain :render_template, :rack_bug
   end
-end
+end

data/lib/rack/bug/panels/templates_panel/rendering.rb

@@ -1,37 +1,37 @@
 module Rack
   module Bug
     class TemplatesPanel
-      
+
       class Rendering
         attr_accessor :name
         attr_accessor :start_time
         attr_accessor :end_time
         attr_accessor :parent
         attr_reader :children
-        
-        
+
+
         def initialize(name)
           @name = name
           @children = []
         end
-        
+
         def add(rendering)
           @children << rendering
           rendering.parent = self
         end
-        
+
         def time
           @end_time - @start_time
         end
-        
+
         def exclusive_time
           time - child_time
         end
-        
+
         def child_time
           children.inject(0.0) { |memo, c| memo + c.time }
         end
-        
+
         def time_summary
           if children.any?
             "%.2fms, %.2f exclusive" % [time * 1_000, exclusive_time * 1_000]
@@ -43,25 +43,25 @@ module Rack
           <<-HTML
             <li>
               <p>#{name} (#{time_summary})</p>
-              
+
               #{children_html}
             </li>
           HTML
         end
-        
+
         def children_html
           return "" unless children.any?
-          
+
           <<-HTML
             <ul>#{joined_children_html}</ul>
           HTML
         end
-        
+
         def joined_children_html
           children.map { |c| c.html }.join
         end
       end
-      
+
     end
   end
-end
+end