mongo_request_logger 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 510692960aea0897abb5821f81b6d4b697030fb9
-  data.tar.gz: 646f281bb97316a9a68e0efbf54fa92e7d6e7c0d
+  metadata.gz: 53d796aa5a6db0352796bd9b46d084720365b2ba
+  data.tar.gz: f558a7fb8110e323c44d6b654e80d3388a24b6c4
 SHA512:
-  metadata.gz: 613a8196480d0dfdf8a427a1a569ec1f56bb12d81567df3cc1c7b9b4bb99f72baacfbe5eadac06826285c6967e60554f60efddbc08450be696dfe8d25d91af74
-  data.tar.gz: ca5be89a4936dc8367f7125ab90ce94c3a8e715b49a3d5e61dbbc8c0c4c77b9a51797b4dc07b234a5bdf4dccf737c3898001433da21484ab6e37ee47217d84db
+  metadata.gz: 1804e0557babf3f86126f22a3046d3d16b992fd2f773453f9f4e8dbb5bd0edbcf3cce9541eb38d3521935bdd19c8bb0cd8987b019930e870bb82d197758f86fc
+  data.tar.gz: e81f29301848770c59d1b9285ba21265d967704425ce60dbd89dd9a3c3b8cbca96c5aea5f122d34109596bf39f16f2c620291f2321e3ae040d1edf4c73335ba2

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-*emfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+**.log

data/Gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: .
+  specs:
+    mongo_request_logger (0.2.6)
+      activesupport (> 3.0.0)
+      sinatra (>= 1.3.2)
+      sinatra-contrib
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    backports (3.3.0)
+    bson (1.8.5)
+    bson_ext (1.8.5)
+      bson (~> 1.8.5)
+    diff-lcs (1.2.3)
+    eventmachine (1.0.3)
+    i18n (0.6.1)
+    mongo (1.8.5)
+      bson (~> 1.8.5)
+    moped (1.4.5)
+    multi_json (1.7.2)
+    rack (1.5.2)
+    rack-protection (1.5.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.0)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.2)
+      tilt (~> 1.3)
+    tilt (1.3.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  mongo
+  mongo_request_logger!
+  moped
+  rspec
+  sinatra (~> 1.4.0)

data/gemfiles/sinatra1.3.gemfile.lock

@@ -0,0 +1,130 @@
+PATH
+  remote: /home/ralf/src/request_logger
+  specs:
+    mongo_request_logger (0.2.6)
+      activesupport (> 3.0.0)
+      sinatra (>= 1.3.2)
+      sinatra-contrib
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    backports (3.3.0)
+    bson (1.8.5)
+    bson_ext (1.8.5)
+      bson (~> 1.8.5)
+    builder (3.0.4)
+    diff-lcs (1.2.3)
+    erubis (2.7.0)
+    eventmachine (1.0.3)
+    hike (1.2.2)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.7)
+    mail (2.5.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.22)
+    mongo (1.8.5)
+      bson (~> 1.8.5)
+    moped (1.4.5)
+    multi_json (1.7.2)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-protection (1.5.0)
+      rack
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.4)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sinatra (1.3.6)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    sinatra-contrib (1.3.2)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.3.0)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.3.7)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  mongo
+  mongo_request_logger!
+  moped
+  rails (~> 3.2.10)
+  rspec
+  sinatra (~> 1.3.2)

data/gemfiles/sinatra1.4.gemfile.lock

@@ -0,0 +1,61 @@
+PATH
+  remote: /home/ralf/src/request_logger
+  specs:
+    mongo_request_logger (0.2.6)
+      activesupport (> 3.0.0)
+      sinatra (>= 1.3.2)
+      sinatra-contrib
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    backports (3.3.0)
+    bson (1.8.5)
+    bson_ext (1.8.5)
+      bson (~> 1.8.5)
+    diff-lcs (1.2.3)
+    eventmachine (1.0.3)
+    i18n (0.6.1)
+    mongo (1.8.5)
+      bson (~> 1.8.5)
+    moped (1.4.5)
+    multi_json (1.7.2)
+    rack (1.5.2)
+    rack-protection (1.5.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.0)
+      backports (>= 2.0)
+      eventmachine
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.2)
+      tilt (~> 1.3)
+    tilt (1.3.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  mongo
+  mongo_request_logger!
+  moped
+  rspec
+  sinatra (~> 1.4.0)

data/lib/mongo_request_logger/adapters/mongo.rb

@@ -68,6 +68,10 @@ module MongoRequestLogger
         @collection.find_one(::BSON::ObjectId(id))
       end
 
+      def clear!
+        raise NotImplementedError
+      end
+
       private
 
       def mongo_connection_object

data/lib/mongo_request_logger/adapters/moped.rb

@@ -6,6 +6,10 @@ require 'active_support/core_ext/hash/indifferent_access'
 module MongoRequestLogger
   module Adapters
     class Moped < Base
+      class << self
+        attr_accessor :connection
+      end
+
 
       def initialize(options = {})
         @configuration = options.with_indifferent_access
@@ -74,6 +78,10 @@ module MongoRequestLogger
         @collection.find("_id" => ::Moped::BSON::ObjectId.from_string(id)).first
       end
 
+      def clear!
+        @collection.drop
+      end
+
       private
 
       def mongo_connection_object
@@ -86,9 +94,31 @@ module MongoRequestLogger
           conn = ::Moped::Session.new(["#{@configuration['host']}:#{@configuration['port']}"], :timeout => 6)
         end
         @connection_type = conn.class
+
+        MongoRequestLogger::Adapters::Moped.connection = conn
         conn
       end
 
     end
   end
 end
+
+# Adapted from Mongoid 3.0.16 lib/mongoid/railtie.rb
+
+# Unicorn clears the START_CTX when a worker is forked, so if we have
+# data in START_CTX then we know we're being preloaded. Unicorn does
+# not provide application-level hooks for executing code after the
+# process has forked, so we reconnect lazily.
+if defined?(Unicorn) && !Unicorn::HttpServer::START_CTX.empty?
+  MongoRequestLogger::Adapters::Moped.connection.disconnect if MongoRequestLogger::Adapters::Moped.connection
+end
+
+# Passenger provides the :starting_worker_process event for executing
+# code after it has forked, so we use that and reconnect immediately.
+if defined?(PhusionPassenger)
+  PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    if MongoRequestLogger::Adapters::Moped.connection && forked
+      MongoRequestLogger::Adapters::Moped.connection.disconnect
+    end
+  end
+end

data/lib/mongo_request_logger/rack.rb

@@ -43,6 +43,12 @@ module MongoRequestLogger
         logger.log_request do
           begin
             request = ::Rack::Request.new(env)
+            begin
+              cl = request.content_length.to_i
+            rescue
+              cl = 0
+            end
+
             options = {
                 path: request.path_info,
                 host: request.host_with_port,
@@ -52,6 +58,7 @@ module MongoRequestLogger
                 query_string: request.query_string,
                 request_method: request.request_method,
                 content_type: request.content_type,
+                content_length: cl,
                 params: request.params
             }
             logger.add_metadata options

data/lib/mongo_request_logger/version.rb

@@ -1,3 +1,3 @@
 module MongoRequestLogger
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/dummy/application.rb

@@ -0,0 +1,37 @@
+require 'rails'
+require 'action_controller/railtie'
+
+
+class Dummy < Rails::Application
+  config.root = File.dirname(__FILE__)
+
+  # Rails needs these keys, but they don't really have to be secret for our tests
+  config.session_store :cookie_store, key: '****************************************'
+  config.secret_token = '****************************************'
+
+  # Our routes
+  routes.draw do
+    mount MongoRequestLogger::Viewer, :at => "log"
+
+    get '/'  => 'dummy#index'
+    post '/'  => 'dummy#index'
+    get '/other' => 'dummy#other'
+  end
+end
+
+# A simple controller
+class DummyController < ActionController::Base
+  def index
+    render text: 'Home'
+  end
+
+  def other
+    render text: 'Other'
+  end
+end
+
+
+# Not sure how to make Rails automatically run the railtie with a dummy app, so we do it manually.
+# In a proper Rails app we don't need this.
+require 'mongo_request_logger/railtie'
+MongoRequestLogger::Railtie.setup(Rails.application)

data/spec/dummy/config/logger.yml

@@ -0,0 +1,5 @@
+test:
+  host: localhost
+  database: request_logger_test
+  capsize: 10  # megabytes
+

data/spec/rails_spec.rb

@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+begin
+  require 'rails'
+
+  # Configure the Rails application
+  ENV["RAILS_ENV"] = "test"
+  require 'dummy/application'
+
+
+
+  describe "Rails Integration" do
+    let(:app) do
+      Rails.application
+    end
+
+    let(:adapter) do
+      MongoRequestLogger::Viewer.adapter
+    end
+
+
+    before :each do
+      adapter.clear!
+    end
+
+    it "should initialize" do
+      Rails.logger.should be_a MongoRequestLogger::Logger
+
+      adapter.should be
+    end
+
+    it "should log basic info" do
+      get '/'
+      last_response.status.should == 200
+      last_response.body.should =~ /Home/
+      last_response.should be_ok
+
+      results = adapter.query({}).to_a
+      results.count.should == 1
+      result = results.first
+      result['timestamp'].should be_within(1.minute).of(Time.now)
+      result['path'].should == '/'
+      result['host'].should == 'example.org'
+      result['ip'].should == '127.0.0.1'
+      result['request_method'].should == 'GET'
+      result['response'].should == 200
+      result['user_agent'].should == ''
+    end
+
+    it "should log get parameters" do
+      get '/?a=5&b=test'
+
+      result = adapter.query({}).first
+      result['path'].should == '/'
+      result['params'].should == {'a' => '5', 'b' => 'test'}
+    end
+
+    it "should log post JSON paramters" do
+      data = '{"test": "yes"}'
+      post '/', {}, {input: data, "CONTENT_TYPE" => 'application/json'}
+      result = adapter.query({}).first
+      result['path'].should == '/'
+      result['request_method'].should == 'POST'
+      result['content_type'].should == 'application/json'
+      result['content_length'].should == data.length
+      result['response'].should == 200
+      # TODO: result['params'].should == {'test' => 'yes'}
+    end
+
+    it "should handle broken post JSON content" do
+      data = "This is not JSON"
+      post '/', {}, {input: data, "CONTENT_TYPE" => 'application/json'}
+      last_response.status.should == 500
+
+      result = adapter.query({}).first
+      result['path'].should == '/'
+      result['response'].should == 500  # Why is it 500?
+      result['request_method'].should == 'POST'
+      result['content_type'].should == 'application/json'
+      result['content_length'].should == data.length
+      result['exception'].should be
+    end
+
+    it "should handle broken post XML content" do
+      data = "This is not XML"
+      post '/', {}, {input: data, "CONTENT_TYPE" => 'application/xml'}
+      last_response.status.should == 500
+
+      result = adapter.query({}).first
+      result['path'].should == '/'
+      result['response'].should == 500  # Why is it 500?
+      result['request_method'].should == 'POST'
+      result['content_type'].should == 'application/xml'
+      result['content_length'].should == data.length
+      result['exception'].should be
+    end
+
+  end
+rescue LoadError
+  # Cannot find Rails - skip these tests
+end

data/spec/shared_examples.rb

@@ -97,12 +97,7 @@ shared_examples "log" do
 
     block = ->{
       logger.log_request do
-        begin
-          infinite_recursion
-        rescue => e
-          logger.exception e
-          raise e
-        end
+        infinite_recursion
       end
     }
 
@@ -114,6 +109,5 @@ shared_examples "log" do
     log['exception'].should == {"class"=>"SystemStackError", "message"=>"stack level too deep"}
     messages = log['messages']
     messages[0].should match /ERROR.*SystemStackError.*stack level too deep/
-    puts messages
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rspec'
+require 'rack/test'
+
 if ENV['COVERAGE']
   require 'simplecov'
   SimpleCov.start do
@@ -15,6 +17,7 @@ end
 if defined? Rails
   Rails.backtrace_cleaner.remove_silencers!
   ENV["RAILS_ENV"] = 'test'
+  RAILS_ROOT = File.join(File.dirname(__FILE__), 'spec/dummy')
 end
 
 # Require all files, so they show up in coverage
@@ -22,3 +25,8 @@ Dir['lib/**/*.rb'].each do |file|
   path = /lib\/(.*)\.rb/.match(file)[1]
   require path
 end
+
+
+RSpec.configure do |conf|
+  conf.include Rack::Test::Methods
+end

data/spec/testapp/app.rb

@@ -5,8 +5,10 @@ class SinatraApp < Sinatra::Base
   set :logging, nil
 
   get '/' do
-    logger.info 'Logging from Sinatra!'
+    puts logger.class.name
+    logger.debug 'Logging from Sinatra!'
 
     "Log test on Sinatra #{Sinatra::VERSION}"
   end
 end
+

data/spec/testapp/config.ru

@@ -1,9 +1,21 @@
+require 'rack/builder'
 require 'mongo_request_logger'
 require './app'
+require 'rack/cascade'
 
-MongoRequestLogger.configure(File.join(File.dirname(__FILE__), 'config/logger.yml'))
+app = Rack::Builder.new do
+  use Rack::Session::Cookie, secret: 'phungah1Geik8Eeth4Eezoh0aj1naeV2oiroh4EZe6Ulei1ohdooxae8cu0amake'
 
-use MongoRequestLogger::Rack
+  MongoRequestLogger.configure(File.join(File.dirname(__FILE__), 'config/logger.yml'))
+  use MongoRequestLogger::Rack
 
-run Rack::URLMap.new("/" => SinatraApp.new,
-    "/log" => MongoRequestLogger::Viewer.new)
+  map "/log" do
+    run MongoRequestLogger::Viewer.new
+  end
+
+  map "/" do
+    run SinatraApp.new
+  end
+end
+
+run app

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_request_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Embark Mobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -63,6 +63,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -371,7 +372,9 @@ files:
 - angular/test/unit/servicesSpec.js
 - config.ru
 - gemfiles/sinatra1.3.gemfile
+- gemfiles/sinatra1.3.gemfile.lock
 - gemfiles/sinatra1.4.gemfile
+- gemfiles/sinatra1.4.gemfile.lock
 - lib/mongo_request_logger.rb
 - lib/mongo_request_logger/adapters/base.rb
 - lib/mongo_request_logger/adapters/mongo.rb
@@ -390,10 +393,13 @@ files:
 - lib/mongo_request_logger/version.rb
 - lib/mongo_request_logger/viewer.rb
 - mongo_request_logger.gemspec
+- spec/dummy/application.rb
+- spec/dummy/config/logger.yml
+- spec/dummy/log/.gitkeep
 - spec/mongo_logger_spec.rb
 - spec/moped_logger_spec.rb
 - spec/query_spec.rb
-- spec/railtie_spec.rb
+- spec/rails_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/testapp/app.rb
@@ -426,10 +432,13 @@ signing_key:
 specification_version: 4
 summary: Structured logger and log viewer for Rack (including Rails) requests
 test_files:
+- spec/dummy/application.rb
+- spec/dummy/config/logger.yml
+- spec/dummy/log/.gitkeep
 - spec/mongo_logger_spec.rb
 - spec/moped_logger_spec.rb
 - spec/query_spec.rb
-- spec/railtie_spec.rb
+- spec/rails_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
 - spec/testapp/app.rb

data/spec/railtie_spec.rb

@@ -1,22 +0,0 @@
-if defined? Rails
-  require 'spec_helper'
-  require 'mongo_request_logger/railtie'
-
-  class TestApp < Rails::Application
-    config.root = File.join(__FILE__, '../testapp')
-  end
-
-  describe 'railtie' do
-    it "should load the Railtie" do
-      # For now, we mostly test that no errors are raised
-      MongoRequestLogger::Railtie.should be
-      MongoRequestLogger::Railtie.setup TestApp
-
-      File.exist?(Rails.root.join('log/test.log')).should == true
-    end
-
-    after do
-      FileUtils.rm_f(Rails.root.join('log/test.log'))
-    end
-  end
-end