Merge 9737286 into 1d96fc7

lib/moped.rb

@@ -3,6 +3,7 @@
 require "stringio"
 require "monitor"
 require "timeout"
+require 'resolv'
 require "bson"
 require "optionable"
 require "moped/errors"

lib/moped/address.rb

@@ -26,10 +26,11 @@ class Address
     # @param [ String ] address The host:port pair as a string.
     #
     # @since 2.0.0
-    def initialize(address)
+    def initialize(address, timeout)
       @original = address
       @host, port = address.split(":")
       @port = (port || 27017).to_i
+      @timeout = timeout
     end
 
     # Resolve the address for the provided node. If the address cannot be
@@ -45,10 +46,18 @@ def initialize(address)
     # @since 2.0.0
     def resolve(node)
       begin
-        @ip ||= Socket.getaddrinfo(host, nil, Socket::AF_INET, Socket::SOCK_STREAM).first[3]
+        Timeout::timeout(@timeout) do
+          Resolv.each_address(host) do |ip|
+            if ip =~ Resolv::IPv4::Regex
+              @ip ||= ip
+              break
+            end
+          end
+          raise Resolv::ResolvError unless @ip
+        end
         @resolved ||= "#{ip}:#{port}"
-      rescue SocketError => e
-        node.instrument(Node::WARN, prefix: "  MOPED:", message: "Could not resolve IP for: #{original}")
+      rescue Timeout::Error, Resolv::ResolvError
+        Loggable.warn("  MOPED:", "Could not resolve IP for: #{original}", "n/a")
         node.down! and false
       end
     end

lib/moped/node.rb

@@ -253,14 +253,14 @@ def hash
     #
     # @since 1.0.0
     def initialize(address, options = {})
-      @address = Address.new(address)
       @options = options
       @down_at = nil
       @refreshed_at = nil
       @latency = nil
       @primary = nil
       @secondary = nil
       @instrumenter = options[:instrumenter] || Instrumentable::Log
+      @address = Address.new(address, timeout)
       @address.resolve(self)
     end
 

spec/moped/address_spec.rb

@@ -7,7 +7,7 @@
     context "when a port is provided" do
 
       let(:address) do
-        described_class.new("127.0.0.1:27017")
+        described_class.new("127.0.0.1:27017", 2)
       end
 
       it "sets the original address" do
@@ -26,7 +26,7 @@
     context "when no port is provided" do
 
       let(:address) do
-        described_class.new("localhost")
+        described_class.new("localhost", 2)
       end
 
       it "sets the original address" do
@@ -52,7 +52,7 @@
       end
 
       let(:address) do
-        described_class.new("127.0.0.1:27017")
+        described_class.new("127.0.0.1:27017", 2)
       end
 
       before do
@@ -75,7 +75,7 @@
       end
 
       let(:address) do
-        described_class.new("localhost:27017")
+        described_class.new("localhost:27017", 2)
       end
 
       before do
@@ -98,7 +98,7 @@
       end
 
       let(:address) do
-        described_class.new("notahost:27017")
+        described_class.new("notahost:27017", 1)
       end
 
       let!(:resolved) do