mongodb_logger 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48c3b365b540c0fdf70f0e4526fb83bd7730a85a
-  data.tar.gz: 3bbb2a8c14841e2adefa225549b959fd52914105
+  metadata.gz: f7463e7411319454a836c0d10ee7725c6d71fe02
+  data.tar.gz: b12df4c637b7ef4e9860789cf2bbd3ba6d79b2b6
 SHA512:
-  metadata.gz: 9760b107a220bb5ddf047ba3e811173fc2775aaf7c6cb8966914ba7a3f202fac05326ffe9427efef78c93e42ab99a2f8004fc4923bdd7d0924556d6c87d3f610
-  data.tar.gz: e961c5158423d113e0b09b2d099bf67a8e67d969a0235cf65b587608eb54753d4fbc5727cd1b6cbfbd3043d64609b34bebd0a79d42de1214342760636a1b7c76
+  metadata.gz: b88448aeb56f96356ded3c87f1881e734a862e52f5cbd7d95db5a27b2187f8673845993051d367939b46e1737fc443dde90abea297f2725457839fe9c457cfc8
+  data.tar.gz: 5461c6c9af82e8fd914b596a7aebcc3b81e6827b6d44ab0edc5af0e83f077b73f09ccfe5666eb0e0f21472ba120756639101859f8ce5ef7bce0bcd9cdc1176df

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
+  - gem install bundler --pre
 before_script:
   - bundle exec rake appraisal:install
 services:
@@ -10,9 +11,17 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - jruby-19mode
+  - ruby-head
+  - jruby-head
 notifications:
   email: false
 branches:
   only:
     - master
     - development
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## master
 
+## 0.6.4
+
+* Fixed for moped gem < 2
 
 ## 0.6.3
 

data/README.md

@@ -289,4 +289,4 @@ Demo Sources: [https://github.com/le0pard/mongodb_logger_example_heroku](https:/
     >> collection.find({:request_time => {'$gt' => Time.utc(2010, 11, 18, 22, 59, 52)}})
 
 
-Copyright (c) 2009-2012 Phil Burrows, CustomInk (based on https://github.com/customink/central_logger) and Leopard released under the MIT license
+Copyright (c) 2009-2014 Phil Burrows, CustomInk (based on https://github.com/customink/central_logger) and Leopard released under the MIT license

data/lib/mongodb_logger/adapters/moped.rb

@@ -26,7 +26,7 @@ module MongodbLogger
       end
 
       def insert_log_record(record, options = {})
-        record[:_id] = ::BSON::ObjectId.new
+        record[:_id] = bson_object_id.new
         @connection.with(write: options[:write_options])[collection_name].insert(record)
       end
 
@@ -46,7 +46,7 @@ module MongodbLogger
       end
 
       def find_by_id(id)
-        @collection.find("_id" => ::BSON::ObjectId.from_string(id)).first
+        @collection.find("_id" => bson_object_id.from_string(id)).first
       end
 
       def calculate_mapreduce(map, reduce, params = {})
@@ -75,6 +75,10 @@ module MongodbLogger
         conn
       end
 
+      def bson_object_id
+        defined?(::BSON::ObjectId) ? ::BSON::ObjectId : ::Moped::BSON::ObjectId
+      end
+
     end
   end
 end

data/lib/mongodb_logger/logger.rb

@@ -17,8 +17,8 @@ module MongodbLogger
     LOG_LEVEL_SYM = [:debug, :info, :warn, :error, :fatal, :unknown]
 
     ADAPTERS = [
-      ["moped", Adapers::Moped],
-      ["mongo", Adapers::Mongo]
+      ["mongo", Adapers::Mongo],
+      ["moped", Adapers::Moped]
     ]
 
     attr_reader   :db_configuration, :mongo_adapter, :app_root, :app_env
@@ -56,10 +56,7 @@ module MongodbLogger
     def add(severity, message = nil, progname = nil, &block)
       $stdout.puts(message) if ENV['HEROKU_RACK'] # log in stdout on Heroku
       if @level && @level <= severity && (message.present? || progname.present?) && @mongo_record.present?
-        # do not modify the original message used by the buffered logger
-        msg = (message ? message : progname)
-        msg = logging_colorized? ? msg.to_s.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip : msg
-        @mongo_record[:messages][LOG_LEVEL_SYM[severity]] << msg
+        add_log_message(severity, message, progname)
       end
       # may modify the original message
       disable_file_logging? ? message : (@level ? super : message)
@@ -74,9 +71,7 @@ module MongodbLogger
 
       runtime = Benchmark.measure{ yield }.real if block_given?
     rescue Exception => e
-      add(3, "#{e.message}\n#{e.backtrace.join("\n")}")
-      # log exceptions
-      @mongo_record[:is_exception] = true
+      log_raised_error(e)
       # Reraise the exception for anyone else who cares
       raise e
     ensure
@@ -84,19 +79,7 @@ module MongodbLogger
       @mongo_record[:runtime] = ((runtime ||= 0) * 1000).ceil
       # error callback
       Base.on_log_exception(@mongo_record) if @mongo_record[:is_exception]
-      begin
-        @insert_block.call
-      rescue
-        begin
-          # try to nice serialize record
-          record_serializer @mongo_record, true
-          @insert_block.call
-        rescue
-          # do extra work to inspect (and flatten)
-          record_serializer @mongo_record, false
-          @insert_block.call rescue nil
-        end
-      end
+      ensure_write_to_mongodb
     end
 
     def excluded_from_log
@@ -116,11 +99,10 @@ module MongodbLogger
     end
 
     def configure
-      default_capsize = DEFAULT_COLLECTION_SIZE
       @db_configuration = {
         host: 'localhost',
         port: 27017,
-        capsize: default_capsize,
+        capsize: DEFAULT_COLLECTION_SIZE,
         ssl: false}.merge(resolve_config).with_indifferent_access
       @db_configuration[:collection] ||= "#{app_env}_log"
       @db_configuration[:application_name] ||= resolve_application_name
@@ -132,22 +114,58 @@ module MongodbLogger
     end
 
     def resolve_application_name
-      Rails.application.class.to_s.split("::").first if defined?(Rails)
+      if defined?(Rails)
+        Rails.application.class.to_s.split("::").first
+      else
+        "RackApp"
+      end
+    end
+
+    def add_log_message(severity, message, progname)
+      # do not modify the original message used by the buffered logger
+      msg = (message ? message : progname)
+      msg = logging_colorized? ? msg.to_s.gsub(/(\e(\[([\d;]*[mz]?))?)?/, '').strip : msg
+      @mongo_record[:messages][LOG_LEVEL_SYM[severity]] << msg
+    end
+
+    def log_raised_error(e)
+      add(3, "#{e.message}\n#{e.backtrace.join("\n")}")
+      # log exceptions
+      @mongo_record[:is_exception] = true
+    end
+
+    def ensure_write_to_mongodb
+      @insert_block.call
+    rescue
+      begin
+        # try to nice serialize record
+        record_serializer @mongo_record, true
+        @insert_block.call
+      rescue
+        # do extra work to inspect (and flatten)
+        record_serializer @mongo_record, false
+        @insert_block.call rescue nil
+      end
     end
 
     def resolve_config
       config = {}
       CONFIGURATION_FILES.each do |filename|
-        config_file = File.join(app_root, 'config', filename)
-        if File.file? config_file
-          config = YAML.load(ERB.new(File.new(config_file).read).result)[app_env]
-          config = config['mongodb_logger'] if config && config.has_key?('mongodb_logger')
-          break unless config.blank?
-        end
+        config = read_config_from_file(File.join(app_root, 'config', filename))
+        break unless config.blank?
       end
       config
     end
 
+    def read_config_from_file(config_file)
+      if File.file? config_file
+        config = YAML.load(ERB.new(File.new(config_file).read).result)[app_env]
+        config = config['mongodb_logger'] if config && config.has_key?('mongodb_logger')
+        return config unless config.blank?
+      end
+      return nil
+    end
+
     def find_adapter
       return Adapers::Mongo if defined?(::Mongo)
       return Adapers::Moped if defined?(::Moped)
@@ -221,7 +239,7 @@ module MongodbLogger
       elsif defined? RACK_ROOT
         @app_root, @app_env = RACK_ROOT, (ENV['RACK_ENV'] || 'production')
       else
-        raise "unknown app type: not Rails or Rack"
+        @app_root, @app_env = File.dirname(__FILE__), 'production'
       end
     end
 

data/lib/mongodb_logger/server_config.rb

@@ -11,10 +11,6 @@ module MongodbLogger
         config = config['mongodb_logger'] if config && config.has_key?('mongodb_logger')
         config
       end
-
-      def set_root_and_env
-        @app_root, @app_env = File.dirname(__FILE__), 'production'
-      end
     end
 
     class << self

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/mongodb_logger.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "aruba", "~> 0.5.4"
   # for tests deps
   gem.add_development_dependency "coffee-script", "~> 2.2"
-  gem.add_development_dependency "rails", ">= 3.1.0"
   gem.add_development_dependency "mongo", "~> 1.9"
   #gem.add_development_dependency "moped", "2.0.0.beta6"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_logger
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Alexey Vasiliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-01 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement