moped 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31a5802e9db7f000e443ba32ba8fd09a8195dba5
-  data.tar.gz: 7d783153a981ce891e3abc42fb55e74a19aadb06
+  metadata.gz: 4c42ef9279d08c76ecf69539b067b93ab0878f4e
+  data.tar.gz: 3a12fc6c37618f64b7554483f186bac840df90bb
 SHA512:
-  metadata.gz: 575a7b7fbdf672db7b84a3c831022c54f3498689b387686e7961664ae1247f3d8fe9dc8c84b96527a7298d03ad70d70464fb769871d89a5e1685994bf365b60c
-  data.tar.gz: 8a41a3ad6e0eab9d3ab5fb67673adec644fd1c6f0d43e01495d00ce63ef42afe48230ef287bc3eec84857800811cdf1db867750ac8123724c6b2106e4fcc62f0
+  metadata.gz: a636e60201e811f5ea5334ae6e2d3418e2c3c483ae992183172abadadf5ffa0b1682acbac4e03684e4d2dede020d3f562e3a512dbfe6395b19615746fc121707
+  data.tar.gz: b733ee7605f748665b060621b7a65bc1ee2ca610f6079ca96c76563329b9140f25468c618e96986abda5be9e963aa52881c6f3982f98d99c5245ae415170c428

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 # Overview
 
+## 2.0.3
+
+### Resolved Issues
+
+* \#333, \#336
+  Disconnect even when IP address not resolved and fix shutdown pool for node. (durran)
+
 ## 2.0.2
 
 ### Resolved Issues
 
 * Dont include peers if node already in the list
   There was a big memory leak, that was including all
-  nodes in the list in every refresh cycle(Arthur Neves)
+  nodes in the list in every refresh cycle. (Arthur Neves)
 
 ## 2.0.1
 

data/README.md

@@ -25,7 +25,7 @@ the Moped section: [mongoid.org](http://mongoid.org/en/moped/)
 License
 -------
 
-Copyright (c) 2011-2013 Bernerd Schaefer, Durran Jordan
+Copyright (c) 2011-2014 Bernerd Schaefer, Durran Jordan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/moped/address.rb

@@ -46,6 +46,7 @@ module Moped
     # @since 2.0.0
     def resolve(node)
       begin
+        return @resolved if @resolved
         Timeout::timeout(@timeout) do
           Resolv.each_address(host) do |ip|
             if ip =~ Resolv::IPv4::Regex
@@ -55,7 +56,7 @@ module Moped
           end
           raise Resolv::ResolvError unless @ip
         end
-        @resolved ||= "#{ip}:#{port}"
+        @resolved = "#{ip}:#{port}"
       rescue Timeout::Error, Resolv::ResolvError, SocketError
         Loggable.warn("  MOPED:", "Could not resolve IP for: #{original}", "n/a")
         node.down! and false

data/lib/moped/connection/manager.rb

@@ -35,6 +35,26 @@ module Moped
         end
       end
 
+      # Shutdown the connection pool for the provided node. In the case of
+      # unresolved IP addresses the resolved address would be nil resulting in
+      # the same pool for all nodes that did not have IP resolved.
+      #
+      # @example Shut down the connection pool.
+      #   Manager.shutdown(node)
+      #
+      # @param [ Node ] node The node.
+      #
+      # @return [ nil ] Always nil.
+      #
+      # @since 2.0.3
+      def shutdown(node)
+        MUTEX.synchronize do
+          pool = pools.delete(node.address.resolved)
+          pool.shutdown{ |conn| conn.disconnect } if pool
+          nil
+        end
+      end
+
       private
 
       # Create a new connection pool for the provided node.

data/lib/moped/node.rb

@@ -137,7 +137,7 @@ module Moped
     #
     # @since 1.2.0
     def disconnect
-      connection{ |conn| conn.disconnect } if address.resolved
+      connection{ |conn| conn.disconnect }
       true
     end
 
@@ -150,9 +150,10 @@ module Moped
     #
     # @since 2.0.0
     def down!
+      @pool = Connection::Manager.shutdown(self)
       @down_at = Time.new
       @latency = nil
-      disconnect
+      true
     end
 
     # Yields the block if a connection can be established, retrying when a
@@ -185,7 +186,6 @@ module Moped
       ensure
         end_execution(:connection)
       end
-
     end
 
     # Set a flag on the node for the duration of provided block so that an

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson