mongo_request_logger 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c12306c3594f970a2b190211b16758d67113b63
-  data.tar.gz: f26c586b32fd61bea54749eb3d0827a9839d4376
+  metadata.gz: 14cc51ac49b41aff00fa2706ef33b7d6746dc5c4
+  data.tar.gz: c31e051b7f43597f14a6801b50bdfac0d588ad4a
 SHA512:
-  metadata.gz: 23d76e70a74a44c733f047e48036e00ca9f3b66d9e7d7f9f35d74fbc5f9df14d7de22adefd6ed94d0838bcc87fdbde9acafa0543a41a2ac6d859d8365bfbb52d
-  data.tar.gz: ab61223b3a505756e35cab7fa53d67f29f48a7c60f70f52e5316fe3b3e9a12fd70ecc233a6554caad86a1108cfa7fe43b68ebf6773ab321d9d467c23c9883add
+  metadata.gz: 03fc69114b36bd8655151147e521b7669648ea4ad495398bb97dff12d0d3d1e119fd254775f559745d220c59f489c6e09c1ce354729a46105911fb038bdddd1b
+  data.tar.gz: 6f595c406735e69032845e2544eb0bfd0019cd5da6509bec8c20fcaa2553e72bfb66ab354229cd52e5d258bc922a2830ba4c366f89003b032f92aad4da227a52

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+
+* Simpler configuration for Sinatra apps.
+
 ## 0.2.2
 
 * Allow Sinatra 1.4.x to be used.

data/README.md

@@ -29,26 +29,38 @@ Routes for log viewer
     mount MongoRequestLogger::Viewer, :at => "log"
 
 
+## Usage with Sinatra (or other Rack-based apps)
 
-## Usage with other Rack-based frameworks (Sinatra, etc)
+Config file is the same as with Rails.
 
-In config.ru, or where appropriate:
+In config.ru:
 
-    require 'moped'
+    require 'mongo_request_logger'
+    require './yourapp'
 
-    config = {
-        database: 'my_log_db',
-        collection: 'log',
-        capsize: 100, # megabytes
-    }
-
-    adapter = MongoRequestLogger::Adapters::Moped.new(config)
-    logger = MongoRequestLogger::Logger.new(adapter, "myapp.log")
-    MongoRequestLogger::Rack.logger = loggger
+    # Configure database details
+    MongoRequestLogger.configure(File.join(File.dirname(__FILE__), 'config/logger.yml'))
 
+    # Enable the middleware to log the requests
     use MongoRequestLogger::Rack
 
-    run MyApp
+    # Mount the log viewer in /log
+    run Rack::URLMap.new("/" => YourApp.new,
+        "/log" => MongoRequestLogger::Viewer.new)
+
+In a Sinatra app:
+
+    # Disable the default logger
+    set :logging, nil
+
+    get '/' do
+        logger.info "Logging from Sinatra!"
+    end
+
+In other Rack-based apps:
+
+    env['rack.logger'].info "Logging from Rack!"
+
 
 ## Ignoring paths
 
@@ -57,7 +69,7 @@ to be ignored:
 
     MongoRequestLogger::Rack.ignore_prefixes << '/assets/'
 
-## Usage with resque
+## Usage with Resque
 
 Extend from MongoRequestLogger::LoggedJob, to have each job logged as if it was a request.
 

data/lib/mongo_request_logger/rack.rb

@@ -25,6 +25,9 @@ module MongoRequestLogger
     end
 
     def call(env)
+      env['rack.logger'] = logger
+      env['rack.errors'] = logger
+
       #HACK: Don't log the log viewer itself
       self.class.ignore_prefixes.each do |prefix|
         if env["PATH_INFO"].to_s.start_with? prefix

data/lib/mongo_request_logger/railtie.rb

@@ -1,51 +1,29 @@
 if (defined? Rails) && Rails.version =~ /^3\./
   require 'mongo_request_logger'
-  require 'mongo_request_logger/config'
-  require 'mongo_request_logger/rack'
-  require 'mongo_request_logger/viewer'
 
   require 'rails'
 
-  begin
-    # We prefer moped ...
-    require 'moped'
-  rescue LoadError
-    # ... but fallback to mongo
-    require 'mongo'
-  end
-
   module MongoRequestLogger
     class Railtie < ::Rails::Railtie
       class << self
         def setup(app)
+          logger = MongoRequestLogger.configure(Rails.root.join('config/logger.yml'), fallback_log: Rails.root.join("log/#{Rails.env}.log"))
+
+          app.config.logger = logger
 
-          global_config = MongoRequestLogger::Config.new
-          global_config.load_file(File.join(Rails.root, "config/logger.yml"))
-          log_config = global_config.namespaced(Rails.env)
-          return unless log_config && log_config['database']
+          Rails.logger = logger
 
-          if defined? Moped
-            adapter = MongoRequestLogger::Adapters::Moped.new(log_config)
-          else
-            adapter = MongoRequestLogger::Adapters::Mongo.new(log_config)
+          if defined? ActiveRecord
+            ActiveRecord::Base.logger = logger
           end
-          Rails.logger = MongoRequestLogger::Logger.new adapter, Rails.root.join("log/#{Rails.env}.log")
 
-          MongoRequestLogger::Rack.logger = Rails.logger
-          MongoRequestLogger::Rack.ignore_prefixes << '/assets'
+          if defined? ActionController
+            ActionController::Base.logger = logger
+          end
 
-          MongoRequestLogger::Viewer.adapter = adapter
 
           app.config.middleware.insert_after ActionDispatch::DebugExceptions, MongoRequestLogger::Rack
 
-          if defined?(PhusionPassenger)
-            PhusionPassenger.on_event(:starting_worker_process) do |forked|
-              if forked
-                adapter.reconnect
-              end
-            end
-          end
-
         end
       end
 

data/lib/mongo_request_logger/version.rb

@@ -1,3 +1,3 @@
 module MongoRequestLogger
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/mongo_request_logger.rb

@@ -2,6 +2,7 @@ require 'mongo_request_logger/ext/buffered_logger'
 require 'mongo_request_logger/ext/logger'
 require 'mongo_request_logger/logger'
 require 'mongo_request_logger/version'
+require 'mongo_request_logger/rack'
 
 if defined?(Rails)
   require 'mongo_request_logger/railtie'
@@ -12,5 +13,52 @@ require 'mongo_request_logger/adapters/mongo'
 
 
 module MongoRequestLogger
+  def self.configure(config_path, options={})
+    require 'mongo_request_logger/config'
+    require 'mongo_request_logger/rack'
+    require 'mongo_request_logger/viewer'
 
+    begin
+      # We prefer moped ...
+      require 'moped'
+    rescue LoadError
+      # ... but fallback to mongo
+      require 'mongo'
+    end
+
+    environment = ENV['RACK_ENV'] || ENV['RAILS_ENV']
+
+    global_config = MongoRequestLogger::Config.new
+    global_config.load_file(config_path)
+    log_config = global_config.namespaced(environment)
+
+    return false unless log_config && log_config['database']
+
+    if defined? Moped
+      adapter = MongoRequestLogger::Adapters::Moped.new(log_config)
+    else
+      adapter = MongoRequestLogger::Adapters::Mongo.new(log_config)
+    end
+
+    fallback_log = options[:fallback_log] || log_config['fallback_log'] || "log/#{environment}.log"
+
+    logger = MongoRequestLogger::Logger.new adapter, fallback_log
+
+    MongoRequestLogger::Rack.logger = logger
+    MongoRequestLogger::Rack.ignore_prefixes << '/assets'
+    MongoRequestLogger::Rack.ignore_prefixes << '/favicon.ico'
+
+    MongoRequestLogger::Viewer.adapter = adapter
+
+    if defined?(PhusionPassenger)
+      PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        if forked
+          adapter.reconnect
+        end
+      end
+    end
+
+    logger
+
+  end
 end

data/spec/testapp/app.rb

@@ -0,0 +1,12 @@
+require 'sinatra/base'
+
+class SinatraApp < Sinatra::Base
+  # This prevents Sinatra from using the default logger
+  set :logging, nil
+
+  get '/' do
+    logger.info 'Logging from Sinatra!'
+
+    'Log test'
+  end
+end

data/spec/testapp/config.ru

@@ -0,0 +1,9 @@
+require 'mongo_request_logger'
+require './app'
+
+MongoRequestLogger.configure(File.join(File.dirname(__FILE__), 'config/logger.yml'))
+
+use MongoRequestLogger::Rack
+
+run Rack::URLMap.new("/" => SinatraApp.new,
+    "/log" => MongoRequestLogger::Viewer.new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_request_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Embark Mobile
@@ -396,6 +396,8 @@ files:
 - spec/railtie_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
+- spec/testapp/app.rb
+- spec/testapp/config.ru
 - spec/testapp/config/logger.yml
 - spec/testapp/log/.gitkeep
 - views/index.erb
@@ -429,5 +431,7 @@ test_files:
 - spec/railtie_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
+- spec/testapp/app.rb
+- spec/testapp/config.ru
 - spec/testapp/config/logger.yml
 - spec/testapp/log/.gitkeep