Initial commit for reads from rs secondaries

kzk · Nov 16, 2010 · 1e57ca9 · 1e57ca9
1 parent 43182b8
commit 1e57ca9
Show file tree

Hide file tree

Showing 11 changed files with 338 additions and 172 deletions.
diff --git a/lib/mongo.rb b/lib/mongo.rb
@@ -40,6 +40,7 @@ module Constants
 require 'mongo/util/conversions'
 require 'mongo/util/support'
 require 'mongo/util/core_ext'
+require 'mongo/util/pool'
 require 'mongo/util/server_version'
 
 require 'mongo/collection'

diff --git a/lib/mongo/collection.rb b/lib/mongo/collection.rb
@@ -245,10 +245,10 @@ def find_one(spec_or_object_id=nil, opts={})
     def save(doc, opts={})
       if doc.has_key?(:_id) || doc.has_key?('_id')
         id = doc[:_id] || doc['_id']
-        update({:_id => id}, doc, :upsert => true, :safe => opts[:safe])
+        update({:_id => id}, doc, :upsert => true, :safe => opts.fetch(:safe, @safe))
         id
       else
-        insert(doc, :safe => opts[:safe])
+        insert(doc, :safe => opts.fetch(:safe, @safe))
       end
     end