bunyan 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 0.2.1
+=============
+* Bunyan now fails silently when a connection error occurs
+
 Version 0.2.0
 =============
 * Moved all configuration-related stuff to the Config class

data/README.md

@@ -56,6 +56,7 @@ More
 
 TODO
 ====
+* Fail silently if no mongo server running
 * Ability to limit bunyan to only run in certain environments
 * Add middleware client for easy drop-in to rails/rack apps
 * <del>Ability to configure size of capped collection</del>

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bunyan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bunyan}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Sharp"]
-  s.date = %q{2010-03-20}
+  s.date = %q{2010-04-06}
   s.description = %q{Bunyan is a thin ruby wrapper around a MongoDB capped collection, created with high-performance, flexible logging in mind.}
   s.email = %q{ajsharp@gmail.com}
   s.extra_rdoc_files = [
@@ -39,7 +39,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/bunyan_spec.rb",
      "spec/config_spec.rb",
-     "spec/integration/non_rails_spec.rb",
      "spec/spec_helper.rb",
      "examples/rails.rb"
   ]

data/lib/bunyan.rb

@@ -56,13 +56,18 @@ module Bunyan
 
     private
       def initialize_connection
-        @db         = Mongo::Connection.new.db(config.database)
-        @connection = @db.connection
-        @collection = retrieve_or_initialize_collection(config.collection)
+        begin
+          @db         = Mongo::Connection.new.db(config.database)
+          @connection = @db.connection
+          @collection = retrieve_or_initialize_collection(config.collection)
+        rescue Mongo::ConnectionFailure => ex
+          @disabled = true
+          $stderr.puts 'An error occured trying to connect to MongoDB!'
+        end
       end
 
       def database_is_usable?
-         configured? && !disabled?
+        configured? && !disabled?
       end
 
       def ensure_required_options_exist

data/spec/bunyan_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe Bunyan::Logger do
   before do
+    Mongo::Connection.unstub!(:new)
     @logger = Bunyan::Logger.instance
     @mock_database = nil
-    Mongo::Connection.unstub!(:new)
   end
 
   it 'should have a connection' do
@@ -13,11 +13,12 @@ describe Bunyan::Logger do
   end
 
   it 'should have a reference to the mongo db object' do
+    configure_test_db
     @logger.db.should be_instance_of Mongo::DB
   end
 
   it 'should have a config hash' do
-    @logger.config.should respond_to :[]
+    Bunyan::Logger.config.should respond_to :[]
   end
 
 
@@ -26,6 +27,29 @@ describe Bunyan::Logger do
   end
 end
 
+describe 'when a mongod instance is not running' do
+  before do
+    Mongo::Connection.stub!(:new).and_raise(Mongo::ConnectionFailure)
+  end
+
+  it 'should not blow up' do
+    lambda {
+      Bunyan::Logger.configure do |c|
+        c.database   'doesnt_matter'
+        c.collection 'b/c mongod isnt running'
+      end
+    }.should_not raise_exception(Mongo::ConnectionFailure)
+  end
+
+  it 'should mark bunyan as disabled' do
+    Bunyan::Logger.configure do |c|
+      c.database   'doesnt_matter'
+      c.collection 'b/c mongod isnt running'
+    end
+    Bunyan::Logger.instance.instance_variable_get(:@disabled).should == true
+  end
+end
+
 describe 'when initializing the collection' do
   before do
     @conn = mock_mongo_connection

data/spec/spec_helper.rb

@@ -8,10 +8,6 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 
 Spec::Runner.configure do |config|
 
-  config.after :each do
-    cleanup_bunyan_config
-  end
-
   config.before :each do
     mock_mongo_connection
   end
@@ -29,10 +25,6 @@ Spec::Runner.configure do |config|
     @mock_database
   end
 
-  def cleanup_bunyan_config
-    Bunyan::Logger.instance_variable_set(:@config, Bunyan::Logger::Config.new)
-  end
-
   def configure_test_db
     Bunyan::Logger.configure do |config|
       config.database   'bunyan_test'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Sharp
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -07:00
+date: 2010-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,5 @@ summary: A MongoDB-based logging solution.
 test_files: 
 - spec/bunyan_spec.rb
 - spec/config_spec.rb
-- spec/integration/non_rails_spec.rb
 - spec/spec_helper.rb
 - examples/rails.rb

data/spec/integration/non_rails_spec.rb

@@ -1,14 +0,0 @@
-# $LOAD_PATH.unshift(File.expand_path(File.dirname('../../lib/bunyan'))
-# 
-# require 'bunyan'
-# 
-# Bunyan::Logger.configure do |c|
-#   c.database   'bunyan_integration_db'
-#   c.collection 'test_log'
-# 
-#   c.size 104857600 # 100.megabytes
-# end
-# 
-# describe 
-# 
-# Bunyan::Logger.insert({  })