rack-insight 0.5.4 → 0.5.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-insight (0.5.3)
+    rack-insight (0.5.4)
       rack
       sqlite3 (>= 1.3.3)
       uuidtools (>= 2.1.2)

data/lib/rack/insight/app.rb

@@ -1,7 +1,7 @@
 require 'rack'
 require "digest/sha1"
 require "rack/insight/config"
-require "rack/insight/logger"
+require "rack/insight/logging"
 require "rack/insight/filtered_backtrace"
 require "rack/insight/options"
 require "rack/insight/panel"
@@ -20,12 +20,12 @@ require 'rack/insight/panels-header'
 
 module Rack::Insight
   class App
-    include Options
+    include Rack::Insight::Options
+    include Rack::Insight::Logging
+
     INSIGHT_ROOT = "/__insight__"
     INSIGHT_REGEX = %r{^#{INSIGHT_ROOT}}
 
-    VERSION = "0.4.4"
-
     class SecurityError < StandardError
     end
 
@@ -34,16 +34,13 @@ module Rack::Insight
       @base_app = app
       @panels = []
       instance_eval(&block) if block_given?
-
-      @logger = Logger.new(read_option(:log_level), read_option(:log_path))
-      Thread.current['rack-insight.logger'] = @logger
       build_normal_stack
       build_debug_stack
+      # TODO: Understand when this would be used
       if options[:on_initialize]
         options[:on_initialize].call(self)
       end
     end
-    attr_reader :logger
     attr_accessor :panels
 
     def call(env)
@@ -51,10 +48,6 @@ module Rack::Insight
       if insight_active?
         @env = env
         self.options = @default_options
-
-        env['rack-insight.logger'] = @logger
-        Thread.current['rack-insight.logger'] = @logger
-
         Rack::Insight.enable
         env["rack-insight.panels"] = []
         @debug_stack.call(env)
@@ -63,7 +56,6 @@ module Rack::Insight
       end
     end
 
-
     def reset(new_options=nil)
       @env = nil
       initialize_options(new_options)
@@ -168,17 +160,17 @@ module Rack::Insight
     def ip_authorized?
       return true unless options["rack-insight.ip_masks"]
 
-      logger.debug{ "Checking #{@original_request.ip} against ip_masks" }
+      logger.info{ "Checking #{@original_request.ip} against ip_masks" } if verbose(:low)
       ip = IPAddr.new(@original_request.ip)
 
       mask = options["rack-insight.ip_masks"].find do |ip_mask|
         ip_mask.include?(ip)
       end
       if mask
-        logger.debug{ "Matched #{mask}" }
+        logger.info{ "Matched #{mask}" } unless verbose(:silent)
         return true
       else
-        logger.debug{ "Matched no masks" }
+        logger.info{ "Matched no masks" } unless verbose(:silent)
         return false
       end
     end
@@ -186,12 +178,12 @@ module Rack::Insight
     def password_authorized?
       return true unless options["rack-insight.password"]
 
-      logger.debug{"Checking password"}
+      logger.info{"Checking password"} if verbose(:low)
 
       expected_sha = Digest::SHA1.hexdigest ["rack-insight", options["rack-insight.password"]].join(":")
       actual_sha = @original_request.cookies["rack-insight_password"]
 
-      logger.debug{"Password result: #{actual_sha == expected_sha}"}
+      logger.info{"Password result: #{actual_sha == expected_sha}"} if verbose(:med)
       actual_sha == expected_sha
     end
   end

data/lib/rack/insight/config.rb

@@ -1,8 +1,13 @@
 module Rack::Insight
   class Config
     class << self
-      attr_accessor :config
+      attr_reader :config, :verbosity, :log_file, :log_level, :rails_log_copy
     end
+    @log_file = STDOUT
+    @log_level = ::Logger::DEBUG
+    @logger = nil
+    @verbosity = true
+    @rails_log_copy = true
 
     DEFAULTS = {
       # You can augment or replace the default set of panel load paths.
@@ -13,18 +18,43 @@ module Rack::Insight
       #   Rack::Insight::Config.configure do |config|
       #     config[:panel_load_paths] << File::join('foo', 'bar')
       #   end
-      :panel_load_paths => [File::join('rack', 'insight', 'panels')]
+      :panel_load_paths => [File::join('rack', 'insight', 'panels')],
+      :logger => @logger,
+      :log_file => @log_file,
+      :log_level => @log_level,
+      :rails_log_copy => @rails_log_copy, # Only has effect when logger is the Rack::Insight::Logger, or a logger behaving like it
+      # Can set a specific verbosity: Rack::Insight::Logging::VERBOSITY[:debug]
+      :verbosity => @verbosity # true is equivalent to relying soley on the log level of each logged message
     }
 
-    #cattr_reader :config
-    #cattr_writer :config
-
     @config ||= DEFAULTS
     def self.configure &block
       yield @config
+      logger.debug("Config#configure:\n  called from: #{caller[0]}\n  with: #{@config}")
+      @logger = config[:logger]
+      @log_level = config[:log_level]
+      @log_file = config[:log_file]
+      @verbosity = config[:verbosity]
       unless config[:panel_load_paths].kind_of?(Array)
         raise "Rack::Insight::Config.config[:panel_load_paths] is invalid: Expected kind of Array but got #{config[:panel_load_paths].class}"
       end
     end
+
+    def self.logger
+      @logger ||= begin
+        logga = self.config[:logger]
+        if logga.nil?
+          warn ("Rack::Insight::Config#configure: logger is not configured, defaults to Ruby's Logger")
+          logga = ::Logger.new(log_file)
+          if logga.respond_to?(:level)
+            logga.level = self.log_level
+          elsif logga.respond_to?(:sev_threshold)
+            logga.sev_threshold = self.log_level
+          end
+        end
+        logga
+      end
+    end
+
   end
 end

data/lib/rack/insight/database.rb

@@ -90,7 +90,7 @@ module Rack::Insight
       end
 
       def execute(*args)
-        logger.info{ ins_args = args.inspect; "(#{[ins_args.length,120].min}/#{ins_args.length})" + ins_args[0..120] }
+        #logger.info{ ins_args = args.inspect; "(#{[ins_args.length,120].min}/#{ins_args.length})" + ins_args[0..120] } if verbose(:debug)
         db.execute(*args)
       end
 
@@ -98,7 +98,7 @@ module Rack::Insight
         @table_name = table_name
         @keys = keys
         if(execute("select * from sqlite_master where name = ?", table_name).empty?)
-          logger.warn{ "Initializing a table called #{table_name}" }
+          logger.info{ "Initializing a table called #{table_name}" } if verbose(:med)
           execute(create_sql)
         end
       end

data/lib/rack/insight/instrumentation/instrument.rb

@@ -1,5 +1,5 @@
 require 'rack/insight/instrumentation/backstage'
-require 'rack/insight/logger'
+require 'rack/insight/logging'
 
 module Rack::Insight
   module Instrumentation
@@ -34,9 +34,9 @@ module Rack::Insight
         @collectors = nil
       end
 
-      include Backstage
+      include Rack::Insight::Instrumentation::Backstage
 
-      include Logging
+      include Rack::Insight::Logging
 
       def run(object, context="::", kind=:instance, called_at = caller[0], method = "<unknown>", args=[], &blk)
         file, line, rest = called_at.split(':')
@@ -62,14 +62,16 @@ module Rack::Insight
         collectors = probe_chain.inject([]) do |list, probe|
           probe.collectors(method_call.method)
         end
-        logger.debug do
-          "Probe chain for: #{method_call.context} #{method_call.kind} #{method_call.method}:\n  #{collectors.map{|col| col.class.name}.join(", ")}"
+        if verbose(:debug)
+          logger.debug do
+            "Probe chain for: #{method_call.context} #{method_call.kind} #{method_call.method}:\n  #{collectors.map{|col| col.class.name}.join(", ")}"
+          end
         end
         collectors
       end
 
       def start_event(method_call, arguments)
-        logger.debug{ "Starting event: #{method_call.context} #{method_call.kind} #{method_call.method}" }
+        logger.debug{ "Starting event: #{method_call.context} #{method_call.kind} #{method_call.method}" } if verbose(:high)
 
         collectors_for(method_call).each do |collector|
           collector.before_detect(method_call, arguments)
@@ -78,7 +80,7 @@ module Rack::Insight
 
       def finish_event(method_call, arguments, start_time, result)
         timing = Timing.new(@start, start_time, Time.now)
-        logger.debug{ "Finishing event: #{method_call.context} #{method_call.kind} #{method_call.method}" }
+        logger.debug{ "Finishing event: #{method_call.context} #{method_call.kind} #{method_call.method}" } if verbose(:high)
         collectors_for(method_call).each do |collector|
           collector.after_detect(method_call, timing, arguments, result)
         end

data/lib/rack/insight/instrumentation/probe.rb

@@ -66,7 +66,8 @@ module Rack::Insight
             begin
               h[k] = self.new(const_from_name(k))
             rescue NameError
-              logger.warn{ "Cannot find constant: #{k}" }
+              logger.warn{ "Cannot find constant: #{k}" } if verbose(:med)
+              false
             end
           end
         end

data/lib/rack/insight/logging.rb

@@ -0,0 +1,33 @@
+module Rack::Insight
+  module Logging
+    VERBOSITY = {
+      :debug => Logger::DEBUG,
+      :high => Logger::INFO,
+      :med => Logger::WARN,
+      :low => Logger::ERROR,
+      # Silent can be used with unless instead of if.  Example:
+      #   logger.info("some message") unless app.verbose(:silent)
+      :silent => Logger::FATAL
+    }
+
+    def logger
+      Rack::Insight::Config.logger
+    end
+    module_function :logger
+
+    # max_level is confusing because the 'level' of output goes up (and this is what max refers to)
+    # when the integer value goes DOWN
+    def verbose(max_level = false)
+      #logger.unknown "Rack::Insight::Config.verbosity: #{Rack::Insight::Config.verbosity} <= max_level: #{VERBOSITY[max_level]}" #for debugging the logger
+      return false if (!Rack::Insight::Config.verbosity) # false results in Exactly Zero output!
+      return true if (Rack::Insight::Config.verbosity == true) # Not checking truthy because need to check against max_level...
+      # Example: if configured log spam level is high (1) logger should get all messages that are not :debug (0)
+      #          so, if a log statement has if verbose(:low) (:low is 3)
+      #          1 <= 3 # true => Message sent to logger
+      #          then, if a log statement has if verbose(:debug) (:debug is 0)
+      #          1 <= 0 # false => Nothing sent to logger
+      return true if Rack::Insight::Config.verbosity <= (VERBOSITY[max_level]) # Integers!
+    end
+    module_function :verbose
+  end
+end

data/lib/rack/insight/panel.rb

@@ -1,5 +1,5 @@
 require "erb"
-require "rack/insight/logger"
+require "rack/insight/logging"
 require 'rack/insight/database'
 require 'rack/insight/instrumentation'
 require 'rack/insight/render'
@@ -17,6 +17,7 @@ module Rack::Insight
     attr_reader :request
 
     class << self
+      attr_accessor :template_root
       def file_index
         return @file_index ||= Hash.new do |h,k|
           h[k] = []
@@ -40,7 +41,7 @@ module Rack::Insight
         Thread::current['rack-panel_file'] = old_rel
       end
 
-      def current_panel_file
+      def current_panel_file(sub)
         return Thread::current['rack-panel_file'] ||
           begin
             file_name = nil
@@ -58,13 +59,14 @@ module Rack::Insight
               end
               break unless file_name.nil?
             end
+            sub.template_root = File.dirname(matched_line.split(':')[0]) if matched_line.respond_to?(:split)
             file_name
           end
       end
 
       def inherited(sub)
-        if filename = current_panel_file
-          Panel::file_index[current_panel_file] << sub
+        if filename = current_panel_file(sub)
+          Panel::file_index[filename] << sub
         else
           warn "Rack::Insight::Panel inherited by #{sub.name} outside rack-insight's :panel_load_paths.  Discarded.  Configured panel load paths are: #{Rack::Insight::Config.config[:panel_load_paths].inspect}"
         end
@@ -87,11 +89,11 @@ module Rack::Insight
 
     def call(env)
       @env = env
-      logger.debug{ "Before call: #{self.name}" }
+      logger.debug{ "Before call: #{self.name}" } if verbose(:debug)
       before(env)
       status, headers, body = @app.call(env)
       @request = Rack::Request.new(env)
-      logger.debug{ "After call: #{self.name}" }
+      logger.debug{ "After call: #{self.name}" } if verbose(:debug)
       after(env, status, headers, body)
       env["rack-insight.panels"] << self
       return [status, headers, body]

data/lib/rack/insight/panels/active_resource_panel.rb

@@ -41,7 +41,7 @@ module Rack::Insight
 
     def content_for_request(number)
       queries = retrieve(number)
-      logger.debug{ "ARes: #{queries.inspect}" }
+      logger.debug{ "ARes: #{queries.inspect}" } if verbose(:debug)
       render_template "panels/active_resource", :queries => queries
     end
   end

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

@@ -39,7 +39,7 @@ module Rack::Insight
       if(defined? Dalli and Dalli::Client === method_call.object)
         method, key = args[0], args[1]
       end
-      logger.info{ "Cache panel got #{method} #{key.inspect}" }
+      logger.info{ "Cache panel got #{method} #{key.inspect}" } if verbose(:high)
       @stats.record_call(method, timing.duration, !result.nil?, key)
     end
 
@@ -58,7 +58,8 @@ module Rack::Insight
     end
 
     def content_for_request(number)
-      logger.debug{{ :req_num => number }}
+      # TODO: What is this syntax with the double {{}}?
+      logger.debug{{ :req_num => number }} if verbose(:debug)
       stats = retrieve(number).first
       render_template "panels/cache", :stats => stats
     end

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

@@ -15,7 +15,7 @@ module Rack::Insight
           instrument "ActiveRecord::ConnectionAdapters::#{adapter}" do
             instance_probe :execute
           end
-            end
+        end
       end
       table_setup("sql_queries")
     end

data/lib/rack/insight/path-filter.rb

@@ -1,8 +1,8 @@
-require 'rack/insight/logger'
+require 'rack/insight/logging'
 
 module Rack::Insight
   class PathFilter
-    include Logging
+    include Rack::Insight::Logging
     def initialize(app)
       @app = app
     end
@@ -16,7 +16,7 @@ module Rack::Insight
         return [404, {}, []]
       end
 
-      logger.debug{ "Shortcutting collection stack: #{filter} =~ #{env['PATH_INFO']}"}
+      logger.debug{ "Shortcutting collection stack: #{filter} =~ #{env['PATH_INFO']}"} if verbose(:debug)
       return @app.call(env)
     end
   end

data/lib/rack/insight/render.rb

@@ -49,26 +49,45 @@ module Rack::Insight
       end
     end
 
+    #def compiled_source(filename)
+    #  primary_file_path = ::File.join(::File.dirname(__FILE__), "views/#{filename}.html.erb")
+    #  file = nil
+    #  begin
+    #    file = ::File.read(primary_file_path)
+    #  rescue Errno::ENOENT
+    #  end
+    #  if file.nil?
+    #    Rack::Insight::Config.config[:panel_load_paths].each do |load_path|
+    #      begin
+    #        file = ::File.read(::File.join(load_path, "#{filename}.html.erb"))
+    #        break # If no error is raised then the file was read!
+    #      rescue Errno::ENOENT
+    #      end
+    #    end
+    #  end
+    #  if file
+    #    ::ERB.new(file, nil, "-").src
+    #  else
+    #    logger.fatal("Rack::Insight: Unable to find expected view template #{primary_file_path} or a #{filename}.html.erb template in rack-insight's :panel_load_paths.  Configured panel load paths are: #{Rack::Insight::Config.config[:panel_load_paths].inspect}")
+    #  end
+    #end
+
     def compiled_source(filename)
-      primary_file_path = ::File.join(::File.dirname(__FILE__), "views/#{filename}.html.erb")
+      templates = []
+      templates << ::File.join(::File.dirname(__FILE__), "views/#{filename}.html.erb")
+      templates << ::File.join(::File.join(self.class.template_root, "#{filename}.html.erb")) if self.class.respond_to?(:template_root)
       file = nil
-      begin
-        file = ::File.read(primary_file_path)
-      rescue Errno::ENOENT
-      end
-      if file.nil?
-        Rack::Insight::Config.config[:panel_load_paths].each do |load_path|
-          begin
-            file = ::File.read(::File.join(load_path, "#{filename}.html.erb"))
-            break # If no error is raised then the file was read!
-          rescue Errno::ENOENT
-          end
+      templates.each do |template_path|
+        begin
+          file = ::File.read(template_path)
+          break # If no error is raised then the file was read!
+        rescue Errno::ENOENT
         end
       end
       if file
-        return ::ERB.new(file, nil, "-").src
+        ::ERB.new(file, nil, "-").src
       else
-        warn "Rack::Insight: Unable to find expected view template #{primary_file_path} or a #{filename}.html.erb template in rack-insight's :panel_load_paths.  Configured panel load paths are: #{Rack::Insight::Config.config[:panel_load_paths].inspect}"
+        logger.fatal("Rack::Insight: Unable to find expected view template #{filename} in any of the following locations: #{templates.inspect}")
       end
     end
 

data/lib/rack/insight/toolbar.rb

@@ -50,7 +50,7 @@ module Rack::Insight
         { :id => row[0], :method => row[1], :path => row[2] }
       end
 
-      logger.info{ "Injecting toolbar: active panels: #{@insight.panels.map{|pnl| pnl.class.name}.inspect}" }
+      logger.info{ "Injecting toolbar: active panels: #{@insight.panels.map{|pnl| pnl.class.name}.inspect}" } unless verbose(:silent)
 
       headers_fragment = render_template("headers_fragment",
                                          :panels => @insight.panels,

data/lib/rack/insight/version.rb

@@ -1,7 +1,7 @@
 module Rack
   module Insight
 
-  VERSION = '0.5.4'
+  VERSION = '0.5.5'
 
   end
 end

data/lib/rack/insight.rb

@@ -3,6 +3,9 @@ require 'rack/insight/app'
 module Rack
   module Insight
     class << self
+
+      include Logging
+
       def enable
         Thread.current["rack-insight.enabled"] = true
       end

data/spec/fixtures/star_trek_panel.rb

@@ -1 +1,6 @@
-class StarTrekPanel < Rack::Insight::Panel; end
+class StarTrekPanel < Rack::Insight::Panel;
+
+  def content_for_request(number)
+    render_template "views/star_trek", :stats => {:captain => "Kirk", :ship => "Enterprise"}
+  end
+end

data/spec/fixtures/views/star_trek.html.erb

@@ -0,0 +1,17 @@
+<h3>StarTrek Panel!</h3>
+<table id="StarTrek">
+  <thead>
+    <tr>
+      <th>
+        <%= stats[:ship] %>
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>
+        <%= stats[:captain] %>
+      </td>
+    </tr>
+  </tbody>
+</table>

data/spec/rack/insight/config_spec.rb

@@ -6,14 +6,16 @@ describe Rack::Insight::Config do
     before(:each) do
       Rack::Insight::Config.configure do |config|
         # spec folder is in the load path during specs!
-        config[:panel_load_paths] << ['fixtures']
+        config[:panel_load_paths] << 'fixtures'
       end
       require 'fixtures/star_trek_panel'
       reset_insight :panel_files => %w{star_trek_panel}
     end
     it "should use StarTrekPanel" do
       app.insight_app.panel_classes.include?(StarTrekPanel).should be_true
-      get_via_rack "/"
+      #get_via_rack "/"
+      response = get "/", :content_type => "application/xhtml+xml"
+      response.should have_selector("table#StarTrek", :content => 'Enterprise')
     end
   end
 

data/spec/rack/insight/panels/active_record_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/active_record_panel'
 
 module Rack::Insight
   describe "ActiveRecordPanel" do

data/spec/rack/insight/panels/cache_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/cache_panel'
 
 module Rack::Insight
   describe "CachePanel" do

data/spec/rack/insight/panels/log_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/log_panel'
 
 module Rack::Insight
   describe "LogPanel" do

data/spec/rack/insight/panels/rails_info_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/rails_info_panel'
 
 module Rack::Insight
   describe "RailsInfoPanel" do

data/spec/rack/insight/panels/redis_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/redis_panel'
 
 module Rack::Insight
   describe "RedisPanel" do

data/spec/rack/insight/panels/sql_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/sql_panel'
 
 module Rack::Insight
   describe "SQLPanel" do

data/spec/rack/insight/panels/templates_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/templates_panel'
 
 module Rack::Insight
   describe "TemplatesPanel" do

data/spec/rack/insight/panels/timer_panel_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'rack/insight/panels/timer_panel'
 
 module Rack::Insight
   describe "TimerPanel" do

data/spec/spec_helper.rb

@@ -12,6 +12,14 @@ require "fixtures/sample_app"
 require "fixtures/dummy_panel"
 require "rack/insight/rspec_matchers"
 
+# Will use the default Ruby Logger.
+Rack::Insight::Config.configure do |config|
+  config[:verbosity] = Rack::Insight::Logging::VERBOSITY[:silent]
+  config[:log_level] = ::Logger::INFO
+end
+puts "Log Level for specs is #{::Logger::ERROR}"
+puts "Verbosity level for specs is #{Rack::Insight::Logging::VERBOSITY.select {|k,v| v == Rack::Insight::Config.verbosity }.keys.first.inspect} or #{Rack::Insight::Config.verbosity}"
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -31,7 +39,6 @@ RSpec.configure do |config|
   config.include Rack::Insight::RspecMatchers
 
   config.before do
-    Thread.current["rack-insight.logger"] = Rack::Insight::Logger.new(Logger::FATAL, "")
     @added_constants = []
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-insight
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -230,7 +230,7 @@ files:
 - lib/rack/insight/instrumentation/probe-definition.rb
 - lib/rack/insight/instrumentation/probe.rb
 - lib/rack/insight/instrumentation/setup.rb
-- lib/rack/insight/logger.rb
+- lib/rack/insight/logging.rb
 - lib/rack/insight/options.rb
 - lib/rack/insight/panel.rb
 - lib/rack/insight/panel_app.rb
@@ -311,6 +311,7 @@ files:
 - spec/fixtures/dummy_panel.rb
 - spec/fixtures/sample_app.rb
 - spec/fixtures/star_trek_panel.rb
+- spec/fixtures/views/star_trek.html.erb
 - spec/insight_spec.rb
 - spec/instrumentation_spec.rb
 - spec/rack/insight/config_spec.rb
@@ -359,6 +360,7 @@ test_files:
 - spec/fixtures/dummy_panel.rb
 - spec/fixtures/sample_app.rb
 - spec/fixtures/star_trek_panel.rb
+- spec/fixtures/views/star_trek.html.erb
 - spec/insight_spec.rb
 - spec/instrumentation_spec.rb
 - spec/rack/insight/config_spec.rb

data/lib/rack/insight/logger.rb

@@ -1,53 +0,0 @@
-module Rack::Insight
-  class Logger
-    def initialize(level, path)
-      @level = level
-      @log_path = path
-      @logfile = nil
-    end
-
-    attr_accessor :level
-
-    DEBUG    =  0
-    INFO     =  1
-    WARN     =  2
-    ERROR    =  3
-    FATAL    =  4
-    UNKNOWN  =  5
-
-    def log(severity, message)
-      message = message.inspect unless String === message
-      return unless severity >= @level
-
-      if defined? Rails and Rails.respond_to?(:logger) and not Rails.logger.nil?
-        Rails.logger.add(severity, "[Rack::Insight]: " + message)
-      end
-
-      logfile.puts(message)
-    end
-
-    def logfile
-      @logfile ||= File::open(@log_path, "a+")
-    rescue
-      $stderr
-    end
-
-    def debug;   log(DEBUG,   yield) end
-    def info;    log(INFO,    yield) end
-    def warn;    log(WARN,    yield) end
-    def error;   log(ERROR,   yield) end
-    def fatal;   log(FATAL,   yield) end
-    def unknown; log(UNKNOWN, yield) end
-  end
-
-  module Logging
-    def logger(env = nil)
-      if env.nil?
-        Thread.current['rack-insight.logger'] ||= Rack::Insight::Logger.new(Logger::DEBUG, "")
-      else
-        env["rack-insight.logger"] ||= Rack::Insight::Logger.new(Logger::DEBUG, "")
-      end
-    end
-    module_function :logger
-  end
-end