mongo 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e82004eeddfd0de07041111726b21f08a990f84e
-  data.tar.gz: 16b8958b0d294edb39e0852ff97e42c3cf40f2ed
+  metadata.gz: 5d0c197b4c58515863de8821a6775eabb7529f87
+  data.tar.gz: 9957802eb4be1f554122d18b6ecdf5694b0dfada
 SHA512:
-  metadata.gz: 1a53b39b1b53f4bf37035384c02fb166edfe140c2a7e2f3f8f443170d459f0a79f65bd3860588eb49316f471ed00dcfd020129af2790fa652bc4e91dc0ad43a2
-  data.tar.gz: fa01e2fe2f3363fe5bc7e2f13d1ec06d1b09f4d818f3a9939d877492af1cfa68b9fae9026746c4851d93aa3df619a84eb834b8ee4877812e843a3d43b00b461e
+  metadata.gz: 4e61898c7dd1343ca322b2fea3cb6c0ac5c6d42eab2ac97a8c3ccf266bf3ad7907aaa2fbb5f0c9a22e67de7b96e8485bb01984a1c2386c5382a0d404dfec345d
+  data.tar.gz: afd71df4bcfa2609d82445b8df6eaa28ba2fabc29b276f925657d85d7aad304cf6251c7e9ffc953162c82d611e4d87aae3993c17b83fc39a5f97b4c5a7559c92

checksums.yaml.gz.sig

@@ -1 +1 @@
-qs�b�F�#L9���㷮F��#�a�כ�6^�>7�0W�j��
w�&��A���W��K�Zh�N�#���(ȓ�}�
+�t奤N�.LQ�����X��(�u�V����
mB�5�����Y�)��%����>i0���}U���ՔI���<ru��K(=a�t��F��
t�������1�HD>
��6�����$�jt>�A�������WՓ�,�C�����P'��^��i�����0��}��
������)�b�n"FYs�&f'a�2�����$�KG�b
���P���?5.���o�	�r�[�S�ZF*A0Q���

data/VERSION

@@ -1 +1 @@
-1.12.0
+1.12.1

data/lib/mongo.rb

@@ -79,6 +79,7 @@ require 'bson'
 
 require 'set'
 require 'thread'
+require 'monitor'
 
 require 'mongo/utils'
 require 'mongo/exception'

data/lib/mongo/connection/node.rb

@@ -24,7 +24,7 @@ module Mongo
       @address = "#{@host}:#{@port}"
       @config = nil
       @socket = nil
-      @node_mutex = Mutex.new
+      @node_mutex = Monitor.new
     end
 
     def eql?(other)
@@ -88,7 +88,7 @@ module Mongo
 
     def active?
       begin
-        result = @client['admin'].command({:ping => 1}, :socket => @socket)
+        result = @client['admin'].command({:ping => 1}, :socket => usable_socket)
       rescue OperationFailure, SocketError, SystemCallError, IOError
         return nil
       end
@@ -107,10 +107,10 @@ module Mongo
 
           if @client.connect_timeout
             Timeout::timeout(@client.connect_timeout, OperationTimeout) do
-              @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
+              @config = @client['admin'].command({:ismaster => 1}, :socket => usable_socket)
             end
           else
-            @config = @client['admin'].command({:ismaster => 1}, :socket => @socket)
+            @config = @client['admin'].command({:ismaster => 1}, :socket => usable_socket)
           end
 
           update_max_sizes
@@ -228,6 +228,16 @@ module Mongo
 
     private
 
+    def usable_socket
+      if @socket && @socket.pid != Process.pid
+        @socket.close
+        @socket = nil
+        connect
+      else
+        @socket
+      end
+    end
+
     def update_max_sizes
       @max_bson_size = config['maxBsonObjectSize'] || DEFAULT_MAX_BSON_SIZE
       @max_message_size = config['maxMessageSizeBytes'] || @max_bson_size * MESSAGE_SIZE_FACTOR

data/lib/mongo/functional/scram.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'base64'
+require 'securerandom'
 require 'openssl'
 require 'digest/md5'
 

data/test/helpers/test_unit.rb

@@ -164,6 +164,7 @@ class Test::Unit::TestCase
     socket.stubs(:closed?)
     socket.stubs(:checkin)
     socket.stubs(:pool)
+    socket.stubs(:pid)
     socket
   end
 

data/test/replica_set/basic_test.rb

@@ -110,6 +110,15 @@ class ReplicaSetBasicTest < Test::Unit::TestCase
     end
   end
 
+  def test_sockets_used_by_forked_process
+    @client = MongoReplicaSetClient.from_uri(@uri)
+    primary_node = @client.manager.primary_pool.node
+    primary_socket = primary_node.socket
+    primary_socket.instance_variable_set(:@pid, primary_socket.pid + 1)
+    primary_node.set_config
+    assert primary_socket != primary_node.socket
+  end
+
   context "Socket pools" do
     context "checking out writers" do
       setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Emily Stolfo
@@ -16,7 +16,7 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDfDCCAmSgAwIBAgIBATANBgkqhkiG9w0BAQUFADBCMRQwEgYDVQQDDAtkcml2
   ZXItcnVieTEVMBMGCgmSJomT8ixkARkWBTEwZ2VuMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMB4XDTE0MDIxOTE1MTEyNloXDTE1MDIxOTE1MTEyNlowQjEUMBIGA1UEAwwL
+  Y29tMB4XDTE1MDMzMTA5NDIzNVoXDTE2MDMzMDA5NDIzNVowQjEUMBIGA1UEAwwL
   ZHJpdmVyLXJ1YnkxFTATBgoJkiaJk/IsZAEZFgUxMGdlbjETMBEGCgmSJomT8ixk
   ARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANFdSAa8fRm1
   bAM9za6Z0fAH4g02bqM1NGnw8zJQrE/PFrFfY6IFCT2AsLfOwr1maVm7iU1+kdVI
@@ -27,14 +27,14 @@ cert_chain:
   u8KAcPHm5KkCAwEAAaN9MHswCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
   BBYEFFt3WbF+9JpUjAoj62cQBgNb8HzXMCAGA1UdEQQZMBeBFWRyaXZlci1ydWJ5
   QDEwZ2VuLmNvbTAgBgNVHRIEGTAXgRVkcml2ZXItcnVieUAxMGdlbi5jb20wDQYJ
-  KoZIhvcNAQEFBQADggEBALGvdxHF+CnH6QO4PeIce3S8EHuHsYiGLk4sWgNGZkjD
-  V3C4XjlI8rQZxalwQwcauacOGj9x94flWUXruEF7+rjUtig7OIrQK2+uVg86vl8r
-  xy1n2s1d31KsuazEVExe5o19tnVbI9+30P9qPkS+NgaellXpj5c5qnJUGn5BJtzo
-  3D001zXpVnuZvCcE/A4fQ+BEM0zm0oOmA/gWIAFrufOL9oYg1881dRZ+kQytF/9c
-  JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
-  9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
+  KoZIhvcNAQEFBQADggEBAH+jEbhVRjZke7ZgM3EjERSblLM8RtHZBczjQKuG0Eor
+  HUF/hyq7D+mz75Ch7K8m5NRwvppePbBV4lAF+DzuDGjh+V6cz4wNKaWWFIL8eNCY
+  F+0vDVtGok06CXnb2swHEtd1Z8zpQviJ3xpSGAvF88+glzvPQmCyA071kPUAmDvd
+  5og5x3Bv8IxaxmEpFndXhT3NHL/tOBeT9VJuJWMCxOXRCv4y9bBBTrxoRVuos59Z
+  XZOS48LlWh15EG4yZo/gRzqNAW2LUIkYA5eMS2Kp6r+KV8IBUO/LaHdrXbdilpa8
+  BRsuCo7UZDbFVRns04HLyjVvkj+K/ywIcdKdS0csz5M=
   -----END CERTIFICATE-----
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.12.1
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongo
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby driver for MongoDB