rack-bug 0.2.1 → 0.3.0

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

@@ -2,44 +2,44 @@ require "rack/bug/panels/active_record_panel/activerecord_extensions"
 
 module Rack
   module Bug
-    
+
     class ActiveRecordPanel < Panel
-      
+
       def self.record(class_name)
         return unless Rack::Bug.enabled?
         records[class_name] += 1
       end
-      
+
       def self.reset
         Thread.current["rack.bug.active_records"] = Hash.new { 0 }
       end
-      
+
       def self.records
         Thread.current["rack.bug.active_records"] ||= Hash.new { 0 }
       end
-      
+
       def self.total
         records.inject(0) do |memo, (key, value)|
           memo + value
         end
       end
-      
+
       def name
         "active_record"
       end
-      
+
       def heading
         "#{self.class.total} AR Objects"
       end
-      
+
       def content
         records = self.class.records.to_a.sort_by { |key, value| value }.reverse
         result = render_template "panels/active_record", :records => records
         self.class.reset
         result
       end
-      
+
     end
-    
+
   end
-end
+end

data/lib/rack/bug/panels/active_record_panel/activerecord_extensions.rb

@@ -6,13 +6,13 @@ if defined?(ActiveRecord)
         Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
         after_initialize_without_rack_bug
       end
-    
+
       alias_method_chain :after_initialize, :rack_bug
     else
       def after_initialize
         Rack::Bug::ActiveRecordPanel.record(self.class.base_class.name)
       end
     end
-    
+
   end
-end
+end

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

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

data/lib/rack/bug/panels/cache_panel/memcache_extension.rb

@@ -42,13 +42,13 @@ if defined?(Memcached)
         prepend_without_rack_bug(key, value)
       end
     end
-    
+
     def delete_with_rack_bug(key)
       Rack::Bug::CachePanel.record(:delete, key) do
         delete_without_rack_bug(key)
       end
     end
-    
+
     def get_with_rack_bug(keys, marshal=true)
       if keys.is_a? Array
         Rack::Bug::CachePanel.record(:get_multi, *keys) do
@@ -117,7 +117,7 @@ if defined?(MemCache)
         delete_without_rack_bug(key, expiry)
       end
     end
-    
+
     alias_method_chain :decr,       :rack_bug
     alias_method_chain :get,        :rack_bug
     alias_method_chain :get_multi,  :rack_bug
@@ -126,4 +126,4 @@ if defined?(MemCache)
     alias_method_chain :add,        :rack_bug
     alias_method_chain :delete,     :rack_bug
   end
-end
+end

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

@@ -1,9 +1,9 @@
 module Rack
   module Bug
     class CachePanel
-      
+
       class PanelApp < ::Rack::Bug::PanelApp
-        
+
         def dispatch
           case request.path_info
           when "/__rack_bug__/view_cache"         then view_cache
@@ -12,37 +12,37 @@ module Rack
           else not_found
           end
         end
-        
+
         def ok
           Rack::Response.new(["OK"]).to_a
         end
-        
+
         def view_cache
           validate_params
           render_template "panels/view_cache", :key => params["key"], :value => Rails.cache.read(params["key"])
         end
-        
+
         def delete_cache
           validate_params
           raise "Rails not found... can't delete key" unless defined?(Rails)
           Rails.cache.delete(params["key"])
           ok
         end
-        
+
         def delete_cache_list
           validate_params
           raise "Rails not found... can't delete key" unless defined?(Rails)
-          
+
           params.each do |key, value|
             next unless key =~ /^keys_/
             Rails.cache.delete(value)
           end
-          
+
           ok
         end
-        
+
       end
-      
+
     end
   end
-end
+end

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

@@ -1,22 +1,22 @@
 module Rack
   module Bug
     class CachePanel
-      
+
       class Stats
         class Query
           attr_reader :method, :time, :hit, :keys
-          
+
           def initialize(method, time, hit, keys)
             @method = method
             @time = time
             @hit = hit
             @keys = keys
           end
-          
+
           def display_time
             "%.2fms" % time
           end
-          
+
           def display_keys
             if keys.size == 1
               keys.first
@@ -25,64 +25,64 @@ module Rack
             end
           end
         end
-        
+
         attr_reader :calls
         attr_reader :keys
         attr_reader :queries
-        
+
         def initialize
           @queries = []
-          @misses = 
+          @misses =
           @calls = 0
           @time = 0.0
           @keys = []
         end
-        
+
         def record_call(method, time, hit, *keys)
           @queries << Query.new(method, time, hit, keys)
           @calls += 1
           @time += time
           @keys += keys
         end
-        
+
         def display_time
           "%.2fms" % time
         end
-        
+
         def time
           @queries.inject(0) do |memo, query|
             memo + query.time
           end
         end
-        
+
         def gets
           count_queries(:get)
         end
-        
+
         def sets
           count_queries(:set)
         end
-        
+
         def deletes
           count_queries(:delete)
         end
-        
+
         def get_multis
           count_queries(:get_multi)
         end
-        
+
         def hits
           @queries.select { |q| [:get, :get_multi].include?(q.method) && q.hit }.size
         end
-        
+
         def misses
           @queries.select { |q| [:get, :get_multi].include?(q.method) && !q.hit }.size
         end
-        
+
         def count_queries(method)
           @queries.select { |q| q.method == method }.size
         end
-        
+
         def queries_to_param
           params = {}
           @queries.each_with_index do |query, index|
@@ -91,7 +91,7 @@ module Rack
           params
         end
       end
-      
+
     end
   end
-end
+end

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

@@ -2,27 +2,44 @@ require "rack/bug/panels/log_panel/rails_extension"
 
 module Rack
   module Bug
-    
+
     class LogPanel < Panel
-      
-      def self.record(message)
+      class LogEntry
+        attr_reader :level, :time, :message
+        LEVELS = ['DEBUG', 'INFO', 'WARN', 'ERROR', 'FATAL']
+
+        def initialize(level, time, message)
+          @level = LEVELS[level]
+          @time = time
+          @message = message
+        end
+
+        def cleaned_message
+          @message.to_s.gsub(/\e\[[;\d]+m/, "")
+        end
+      end
+
+      def self.record(message, log_level)
         return unless Rack::Bug.enabled?
         return unless message
-        logs << message.to_s
+        Thread.current["rack.bug.logs.start"] ||= Time.now
+        timestamp = ((Time.now - Thread.current["rack.bug.logs.start"]) * 1000).to_i
+        logs << LogEntry.new(log_level, timestamp, message)
       end
-      
+
       def self.reset
         Thread.current["rack.bug.logs"] = []
+        Thread.current["rack.bug.logs.start"] = nil
       end
-      
+
       def self.logs
         Thread.current["rack.bug.logs"] ||= []
       end
-      
+
       def name
         "log"
       end
-      
+
       def heading
         "Log"
       end
@@ -32,8 +49,8 @@ module Rack
         self.class.reset
         return result
       end
-      
+
     end
-    
+
   end
 end

data/lib/rack/bug/panels/log_panel/rails_extension.rb

@@ -2,10 +2,10 @@ if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
   module LoggingExtensions
     def add(*args, &block)
       logged_message = super
-      Rack::Bug::LogPanel.record(logged_message)
+      Rack::Bug::LogPanel.record(logged_message, args[0])
       return logged_message
     end
   end
 
   Rails.logger.extend LoggingExtensions
-end
+end

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

@@ -1,18 +1,18 @@
-# 
+#
 module Rack
   module Bug
-    
+
     class MemoryPanel < Panel
-      
+
       def before(env)
         @original_memory = `ps -o rss= -p #{$$}`.to_i
       end
-      
+
       def after(env, status, headers, body)
         @total_memory = `ps -o rss= -p #{$$}`.to_i
         @memory_increase = @total_memory - @original_memory
       end
-      
+
       def heading
         "#{@memory_increase} KB &#916;, #{@total_memory} KB total"
       end
@@ -20,8 +20,8 @@ module Rack
       def has_content?
         false
       end
-      
+
     end
-    
+
   end
-end
+end

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

@@ -1,12 +1,12 @@
 module Rack
   module Bug
-    
+
     class RailsInfoPanel < Panel
-      
+
       def name
         "rails_info"
       end
-      
+
       def heading
         return unless (defined?(Rails) && defined?(Rails::Info))
         "Rails #{Rails.version}"
@@ -16,8 +16,8 @@ module Rack
         return unless (defined?(Rails) && defined?(Rails::Info))
         render_template "panels/rails_info"
       end
-      
+
     end
-    
+
   end
 end

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

@@ -6,13 +6,13 @@ module Rack
 
       autoload :Stats, "rack/bug/panels/redis_panel/stats"
 
-      def self.record(*redis_command_args, &block)
+      def self.record(redis_command_args, backtrace, &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, redis_command_args)
+        stats.record_call(total_time * 1_000, redis_command_args, backtrace)
         return result
       end
 
@@ -41,4 +41,4 @@ module Rack
     end
 
   end
-end
+end