mongo_request_logger 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14cc51ac49b41aff00fa2706ef33b7d6746dc5c4
-  data.tar.gz: c31e051b7f43597f14a6801b50bdfac0d588ad4a
+  metadata.gz: 686d9920c99400beb652b916232a1c96a993bd96
+  data.tar.gz: 9f60ec4554d2f7d30c21cd1d1da25cc8d6047727
 SHA512:
-  metadata.gz: 03fc69114b36bd8655151147e521b7669648ea4ad495398bb97dff12d0d3d1e119fd254775f559745d220c59f489c6e09c1ce354729a46105911fb038bdddd1b
-  data.tar.gz: 6f595c406735e69032845e2544eb0bfd0019cd5da6509bec8c20fcaa2553e72bfb66ab354229cd52e5d258bc922a2830ba4c366f89003b032f92aad4da227a52
+  metadata.gz: 04ca6c4bfc3152ac76195cb468ecac824518c456fb6ea4ccead67910acea8a017718e7e3258392a04b1826d9a9d25eeba209c1061cb433d0cdbbf12e50aead4c
+  data.tar.gz: 4abb554be869b9ba08977b0df18050d0ba6ef12c75278bf62688d3e4f9c8ccc524aafc9925d6699f4cb82e22ba40757b62048baea3adc3b56071d7cefc3c3e2c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.4
+
+* Improved hanlding of logger when not configured for an environment.
+
 ## 0.2.3
 
 * Simpler configuration for Sinatra apps.

data/Gemfile

@@ -4,7 +4,7 @@ gem 'mongo'
 gem 'bson_ext'
 gem 'moped'
 gem 'rspec'
-gem 'rails', '~> 3.2.10'
+gem 'sinatra', '~> 1.4.0'
 
 # Specify your gem's dependencies in mongo_request_logger.gemspec
 gemspec

data/README.md

@@ -50,7 +50,7 @@ In config.ru:
 
 In a Sinatra app:
 
-    # Disable the default logger
+    # This prevents Sinatra from using the default logger, so it uses our logger instead.
     set :logging, nil
 
     get '/' do

data/lib/mongo_request_logger.rb

@@ -31,33 +31,36 @@ module MongoRequestLogger
     global_config = MongoRequestLogger::Config.new
     global_config.load_file(config_path)
     log_config = global_config.namespaced(environment)
+    fallback_log = options[:fallback_log] || log_config['fallback_log'] || "log/#{environment}.log"
+
+
+    if log_config && log_config['database']
+      if defined? Moped
+        adapter = MongoRequestLogger::Adapters::Moped.new(log_config)
+      else
+        adapter = MongoRequestLogger::Adapters::Mongo.new(log_config)
+      end
 
-    return false unless log_config && log_config['database']
+      MongoRequestLogger::Viewer.adapter = adapter
+
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          if forked
+            adapter.reconnect
+          end
+        end
+      end
 
-    if defined? Moped
-      adapter = MongoRequestLogger::Adapters::Moped.new(log_config)
+      logger = MongoRequestLogger::Logger.new adapter, fallback_log
     else
-      adapter = MongoRequestLogger::Adapters::Mongo.new(log_config)
+      logger = ::Logger.new(fallback_log)
     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

data/lib/mongo_request_logger/rack.rb

@@ -25,42 +25,51 @@ module MongoRequestLogger
     end
 
     def call(env)
-      env['rack.logger'] = logger
-      env['rack.errors'] = logger
+      if logger
+        env['rack.logger'] = logger
+        env['rack.errors'] = logger
+      end
+
+      if logger && logger.is_a?(MongoRequestLogger::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
-          return @app.call(env)
+        #HACK: Don't log the log viewer itself
+        self.class.ignore_prefixes.each do |prefix|
+          if env["PATH_INFO"].to_s.start_with? prefix
+            return @app.call(env)
+          end
         end
-      end
-      # TODO: filter parameters
-      # KLUDGE: this will cause parameter parsing to happen twice: once here, once later on in Rails.
-      # Or maybe it's automatically cached in env?
-      logger.log_request do
-        begin
-          request = ::Rack::Request.new(env)
-          options = {
-              path: request.path_info,
-              host: request.host_with_port,
-              user_agent: request.user_agent,
-              ip: request.ip,
-              referer: request.referrer,
-              query_string: request.query_string,
-              request_method: request.request_method,
-              content_type: request.content_type,
-              params: request.params
-          }
-          logger.add_metadata options
-          logger.add_metadata_set :tags, "rack"
-          status, headers, body = @app.call(env)
-          logger.add_metadata response: status.to_i
-          [status, headers, body]
-        rescue Exception => e
-          logger.add_metadata response: 500
-          raise
+        # TODO: filter parameters
+        # KLUDGE: this will cause parameter parsing to happen twice: once here, once later on in Rails.
+        # Or maybe it's automatically cached in env?
+        logger.log_request do
+          begin
+            request = ::Rack::Request.new(env)
+            options = {
+                path: request.path_info,
+                host: request.host_with_port,
+                user_agent: request.user_agent,
+                ip: request.ip,
+                referer: request.referrer,
+                query_string: request.query_string,
+                request_method: request.request_method,
+                content_type: request.content_type,
+                params: request.params
+            }
+            logger.add_metadata options
+            logger.add_metadata_set :tags, "rack"
+            status, headers, body = @app.call(env)
+            logger.add_metadata response: status.to_i
+            [status, headers, body]
+          rescue Exception => e
+            logger.add_metadata response: 500
+            raise
+          end
         end
+      else
+        # No logger configured - just pass the request straight through
+        @app.call(env)
       end
+
     end
   end
 end

data/lib/mongo_request_logger/version.rb

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

data/lib/mongo_request_logger/viewer.rb

@@ -58,7 +58,9 @@ module MongoRequestLogger
       #end
 
       data = []
-      if errors.empty?
+      if adapter.nil?
+        errors << "Log database is not configured"
+      elsif errors.empty?
         begin
           cursor = adapter.query(query, :limit => SERVER_LOGS_PER_PAGE)
           data = cursor.to_a

data/spec/testapp/app.rb

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

data/spec/testapp/log/.gitignore

@@ -0,0 +1 @@
+*.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_request_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Embark Mobile
@@ -399,6 +399,7 @@ files:
 - spec/testapp/app.rb
 - spec/testapp/config.ru
 - spec/testapp/config/logger.yml
+- spec/testapp/log/.gitignore
 - spec/testapp/log/.gitkeep
 - views/index.erb
 homepage: ''
@@ -434,4 +435,5 @@ test_files:
 - spec/testapp/app.rb
 - spec/testapp/config.ru
 - spec/testapp/config/logger.yml
+- spec/testapp/log/.gitignore
 - spec/testapp/log/.gitkeep