columbo 0.1.0 → 0.1.1

data/README.md

@@ -13,7 +13,12 @@ If your application includes a rackup file
 or uses *Rack::Builder* to construct the application pipeline, 
 simply require and use as follows:
 
-    require 'columbo/capture'
+    require 'columbo/capture', {
+      capture: true,
+      bench: false,
+      mongo_uri: 'mongodb://user:password@mongodb_host:port/database',
+      logger: 'log/columbo.log'
+    }
     use Columbo::Capture
     run app
 
@@ -27,10 +32,11 @@ In order to use, include the following in a Rails application
 *config/application.rb* file:
 
     require 'columbo/capture'
-    config.middleware.insert_before ActionDispatch::ShowExceptions, Columbo::Capture, {
+    config.middleware.insert 0, Columbo::Capture, {
       capture: Rails.env.production?,
-      bench: true,
-      mongo_uri: 'mongodb://user:password@mongodb_host:port/database'
+      bench: false,
+      mongo_uri: 'mongodb://user:password@mongodb_host:port/database',
+      logger: 'log/columbo.log'
     }
 
 Check the Rack configuration:

data/lib/columbo/capture.rb

@@ -6,15 +6,16 @@ module Columbo
   class Capture
     include Rack::Utils
 
-    FORMAT = %{[Columbo #{Columbo::VERSION}] %s - [%s] %s "%s%s %s"\n}
+    FORMAT = %{[Columbo #{Columbo::VERSION}] [%s] %s - %s "%s%s %s\n}
 
     def initialize(app, opts={})
       @app = app
-      @capture    = opts[:capture] || false
-      @bench      = (opts[:capture] && opts[:bench]) || false
-      @logger     = opts[:logger]
+      @capture    = opts[:capture]
+      @bench      = opts[:capture] && opts[:bench]
       @mongo_uri  = opts[:mongo_uri]
 
+      Columbo.logger = opts[:logger] if opts[:logger]
+
       raise ArgumentError, 'mongo URI missing.' if @mongo_uri.nil?
 
       @inspector = Columbo::Inspector.new @mongo_uri
@@ -38,14 +39,23 @@ module Columbo
           headers['content-type'] &&
           headers['content-type'].include?("text/html")
 
-        Thread.new { @inspector.investigate env, status, headers, response, start_processing, stop_processing if @capture }
+        Thread.abort_on_exception = true
+
+        Thread.new do
+          begin
+            @inspector.investigate env, status, headers, response, start_processing, stop_processing
+          rescue Exception => e
+            log_error env, e
+          end
+        end if @capture
 
       end
 
       if @bench
         stop = Time.now
-        log(env, (stop-start).seconds)
-        headers['Columbo'] = "version #{Columbo::VERSION}, time #{(stop-start).seconds}s"
+        duration = ((stop-start).seconds * 1000).round(3)
+        log(env, "Time: #{duration}ms")
+        headers['Columbo'] = "version #{Columbo::VERSION}, time #{duration}ms"
       end
 
       [status, headers, response]
@@ -53,19 +63,28 @@ module Columbo
 
     private
 
-    def log(env, time)
+    def log(env, message)
       now = Time.now
-      logger = @logger || env['rack.errors']
+
+      logger = Columbo.logger || env['rack.errors']
 
       logger.write FORMAT % [
-          "Time: #{time}s",
-          now.strftime("%d-%b-%Y %H:%M:%S"),
-          env["REQUEST_METHOD"],
-          env["PATH_INFO"],
-          env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
-          env["HTTP_VERSION"]
+          now.strftime('%d-%b-%Y %H:%M:%S'),
+          message,
+          env['REQUEST_METHOD'],
+          env['PATH_INFO'],
+          env['QUERY_STRING'].empty? ? '' : '?' + env['QUERY_STRING'],
+          env['HTTP_VERSION']
       ]
     end
 
+    def log_error(env, exception)
+      begin
+        logger = Columbo.logger || env['rack.errors']
+        log env, "Error: " + exception.message
+        logger.write "#{exception.backtrace.join("\n")}\n"
+      end
+    end
+
   end
 end

data/lib/columbo/inspector.rb

@@ -22,8 +22,6 @@ module Columbo
       # Get request headers
       request_headers = {}
       request.env.each { |key, value| request_headers[key.sub(/^HTTP_/, '').downcase] = value if key.start_with? 'HTTP_'}
-      # Convert MIME types into String
-      formats = request.env['action_dispatch.request.formats'].collect {|format| format.to_s}
       data = {
           request: {
               params: request.params,
@@ -40,7 +38,6 @@ module Columbo
               http: request.env['SERVER_PROTOCOL'],
               session: request.env['rack.session'],
               cookie: request.env['rack.request.cookie_hash'],
-              formats: formats,
               path_parameters: request.env['action_dispatch.request.path_parameters'],
               headers: request_headers
           },
@@ -55,7 +52,6 @@ module Columbo
           time: stop-start
       }
       # Insert data in MongoDB
-      # TODO: error logging
       client.insert sanitize(data)
     end
 

data/lib/columbo/log_writer.rb

@@ -0,0 +1,25 @@
+require 'logger'
+
+module Columbo
+
+  class LogWriter < Logger
+    def initialize(log = STDOUT)
+      super(log)
+      self.level = Logger::INFO
+      self.formatter = Simple.new
+      self
+    end
+
+    def write(message)
+      add Logger::INFO, message
+    end
+
+    class Simple < Logger::Formatter
+      # Provide a call() method that returns the formatted message.
+      def call(severity, time, program_name, message)
+        "#{message}"
+      end
+    end
+
+  end
+end

data/lib/columbo/version.rb

@@ -1,3 +1,3 @@
 module Columbo
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/columbo.rb

@@ -1,7 +1,16 @@
 require 'columbo/version'
 require 'columbo/db_client'
 require 'columbo/inspector'
+require 'columbo/log_writer'
 
 module Columbo
   MONGO_COLLECTION = "hits".freeze
+
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(log = STDOUT)
+    @logger = Columbo::LogWriter.new log
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: columbo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -103,6 +103,7 @@ files:
 - lib/columbo/capture.rb
 - lib/columbo/db_client.rb
 - lib/columbo/inspector.rb
+- lib/columbo/log_writer.rb
 - lib/columbo/version.rb
 - lib/columbo/web.rb
 - lib/columbo.rb