mongo 2.0.6 → 2.1.0

data/lib/mongo/server.rb

@@ -40,6 +40,9 @@ module Mongo
     # @return [ Hash ] The options hash.
     attr_reader :options
 
+    # @return [ Monitoring ] monitoring The monitoring.
+    attr_reader :monitoring
+
     # Get the description from the monitor and scan on monitor.
     def_delegators :monitor, :description, :scan!
 
@@ -89,6 +92,21 @@ module Mongo
       Context.new(self)
     end
 
+    # Determine if a connection to the server is able to be established and
+    # messages can be sent to it.
+    #
+    # @example Is the server connectable?
+    #   server.connectable?
+    #
+    # @return [ true, false ] If the server is connectable.
+    #
+    # @since 2.1.0
+    def connectable?
+      context.with_connection do |connection|
+        connection.connectable?
+      end
+    end
+
     # Disconnect the server from the connection.
     #
     # @example Disconnect the server.
@@ -98,27 +116,31 @@ module Mongo
     #
     # @since 2.0.0
     def disconnect!
-      context.with_connection do |connection|
-        connection.disconnect!
-      end
+      pool.disconnect!
       monitor.stop! and true
     end
 
     # Instantiate a new server object. Will start the background refresh and
     # subscribe to the appropriate events.
     #
+    # @api private
+    #
     # @example Initialize the server.
-    #   Mongo::Server.new('127.0.0.1:27017', cluster, listeners)
+    #   Mongo::Server.new('127.0.0.1:27017', cluster, monitoring, listeners)
+    #
+    # @note Server must never be directly instantiated outside of a Cluster.
     #
     # @param [ Address ] address The host:port address to connect to.
     # @param [ Cluster ] cluster  The cluster the server belongs to.
+    # @param [ Monitoring ] monitoring The monitoring.
     # @param [ Event::Listeners ] event_listeners The event listeners.
     # @param [ Hash ] options The server options.
     #
     # @since 2.0.0
-    def initialize(address, cluster, event_listeners, options = {})
+    def initialize(address, cluster, monitoring, event_listeners, options = {})
       @address = address
       @cluster = cluster
+      @monitoring = monitoring
       @options = options.freeze
       @monitor = Monitor.new(address, event_listeners, options)
       monitor.scan!
@@ -164,5 +186,17 @@ module Mongo
         tags[k] && tags[k] == tag_set[k]
       end
     end
+
+    # Restart the server monitor.
+    #
+    # @example Restart the server monitor.
+    #   server.reconnect!
+    #
+    # @return [ true ] Always true.
+    #
+    # @since 2.1.0
+    def reconnect!
+      monitor.restart! and true
+    end
   end
 end

data/lib/mongo/server_selector/selectable.rb

@@ -20,17 +20,6 @@ module Mongo
     # @since 2.0.0
     module Selectable
 
-      # The max latency in seconds between the closest server and other servers
-      # considered for selection.
-      #
-      # @since 2.0.0
-      LOCAL_THRESHOLD = 0.015.freeze
-
-      # How long to block for server selection before throwing an exception.
-      #
-      # @since 2.0.0
-      SERVER_SELECTION_TIMEOUT = 30.freeze
-
       # @return [ Hash ] options The options.
       attr_reader :options
 
@@ -53,24 +42,29 @@ module Mongo
 
       # Initialize the server selector.
       #
-      # @example Initialize the preference with tag sets.
-      #   Mongo::ServerSelector::Secondary.new([{ 'tag' => 'set' }])
+      # @example Initialize the selector.
+      #   Mongo::ServerSelector::Secondary.new(:tag_sets => [{'dc' => 'nyc'}])
       #
       # @example Initialize the preference with no options.
       #   Mongo::ServerSelector::Secondary.new
       #
-      # @param [ Array ] tag_sets The tag sets used to select servers.
+      # @param [ Hash ] options The server preference options.
       #
-      # @todo: document specific error
-      # @raise [ Exception ] If tag sets are specified but not allowed.
+      # @option options [ Integer ] :server_selection_timeout The timeout in seconds
+      #   for selecting a server.
+      #
+      # @option options [ Integer ] :local_threshold The local threshold boundary for
+      #  nearest selection in seconds.
+      #
+      # @raise [ Error::InvalidServerPreference ] If tag sets are specified
+      #   but not allowed.
       #
       # @since 2.0.0
-      def initialize(tag_sets = [], options = {})
-        if !tag_sets.all? { |set| set.empty? } && !tags_allowed?
-          raise Error::InvalidServerPreference.new(name)
-        end
-        @tag_sets = tag_sets
-        @options = options
+      def initialize(options = {})
+        @options = (options || {}).freeze
+        tag_sets = options[:tag_sets] || []
+        validate_tag_sets!(tag_sets)
+        @tag_sets = tag_sets.freeze
       end
 
       # Select a server from eligible candidates.
@@ -86,14 +80,11 @@ module Mongo
       def select_server(cluster)
         deadline = Time.now + server_selection_timeout
         while (deadline - Time.now) > 0
-          if cluster.single?
-            servers = cluster.servers
-          elsif cluster.sharded?
-            servers = near_servers(cluster.servers)
-          else
-            servers = select(cluster.servers)
+          servers = candidates(cluster)
+          if servers && !servers.compact.empty?
+            server = servers.first
+            return server if server.connectable?
           end
-          return servers.first if servers && !servers.compact.empty?
           cluster.scan!
         end
         raise Error::NoServerAvailable.new(self)
@@ -109,7 +100,7 @@ module Mongo
       # @since 2.0.0
       def server_selection_timeout
         @server_selection_timeout ||=
-          (options[:server_selection_timeout] || SERVER_SELECTION_TIMEOUT)
+          (options[:server_selection_timeout] || ServerSelector::SERVER_SELECTION_TIMEOUT)
       end
 
       # Get the local threshold boundary for nearest selection in seconds.
@@ -121,11 +112,21 @@ module Mongo
       #
       # @since 2.0.0
       def local_threshold
-        @local_threshold ||= (options[:local_threshold] || LOCAL_THRESHOLD)
+        @local_threshold ||= (options[:local_threshold] || ServerSelector::LOCAL_THRESHOLD)
       end
 
       private
 
+      def candidates(cluster)
+        if cluster.single?
+          cluster.servers
+        elsif cluster.sharded?
+          near_servers(cluster.servers)
+        else
+          select(cluster.servers)
+        end
+      end
+
       # Select the primary from a list of provided candidates.
       #
       # @param [ Array ] candidates List of candidate servers to select the
@@ -186,6 +187,14 @@ module Mongo
         end
         matches || []
       end
+
+      private
+
+      def validate_tag_sets!(tag_sets)
+        if !tag_sets.all? { |set| set.empty? } && !tags_allowed?
+          raise Error::InvalidServerPreference.new(name)
+        end
+      end
     end
   end
 end

data/lib/mongo/server_selector.rb

@@ -27,6 +27,22 @@ module Mongo
   module ServerSelector
     extend self
 
+    # The max latency in seconds between the closest server and other servers
+    # considered for selection.
+    #
+    # @since 2.0.0
+    LOCAL_THRESHOLD = 0.015.freeze
+
+    # How long to block for server selection before throwing an exception.
+    #
+    # @since 2.0.0
+    SERVER_SELECTION_TIMEOUT = 30.freeze
+
+    # Primary read preference.
+    #
+    # @since 2.1.0
+    PRIMARY = Options::Redacted.new(mode: :primary).freeze
+
     # Hash lookup for the selector classes based off the symbols
     #   provided in configuration.
     #
@@ -43,20 +59,13 @@ module Mongo
     #
     # @example Get a server selector object for selecting a secondary with
     #   specific tag sets.
-    #   Mongo::ServerSelector.get({ :mode => :secondary, :tag_sets => [{'dc' => 'nyc'}] })
+    #   Mongo::ServerSelector.get(:mode => :secondary, :tag_sets => [{'dc' => 'nyc'}])
     #
     # @param [ Hash ] preference The server preference.
-    # @param [ Hash ] options The preference options.
-    #
-    # @option preference :mode [ Symbol ] The preference mode.
-    # @option preference :tag_sets [ Array<Hash> ] The tag sets.
     #
     # @since 2.0.0
-    def get(preference = {}, options = {})
-      PREFERENCES.fetch(preference[:mode] || :primary).new(
-        preference[:tag_sets] || [],
-        options
-      )
+    def get(preference = {})
+      PREFERENCES.fetch(preference[:mode] || :primary).new(preference)
     end
   end
 end

data/lib/mongo/socket/ssl.rb

@@ -54,10 +54,10 @@ module Mongo
       # @since 2.0.0
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
-          @tcp_socket.connect(::Socket.pack_sockaddr_in(port, host))
+          handle_errors { @tcp_socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, context)
           @socket.sync_close = true
-          @socket.connect
+          handle_errors { @socket.connect }
           verify_certificate!(@socket)
           self
         end
@@ -100,22 +100,34 @@ module Mongo
 
       def create_context(options)
         context = OpenSSL::SSL::SSLContext.new
-        if options[:ssl_cert]
-          context.cert = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]))
-        end
-        if options[:ssl_key]
-          if options[:ssl_key_pass_phrase]
-            context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]),
-                                                           options[:ssl_key_pass_phrase])
-          else
-            context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]))
-          end
+        set_cert(context, options) if options[:ssl_cert]
+        set_key(context, options) if options[:ssl_key]
+        set_cert_verification(context, options) unless options[:ssl_verify] == false
+        context
+      end
+
+      def set_cert(context, options)
+        context.cert = OpenSSL::X509::Certificate.new(File.open(options[:ssl_cert]))
+      end
+
+      def set_key(context, options)
+        if options[:ssl_key_pass_phrase]
+          context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]),
+                                               options[:ssl_key_pass_phrase])
+        else
+          context.key = OpenSSL::PKey::RSA.new(File.open(options[:ssl_key]))
         end
-        if options[:ssl_verify] || options[:ssl_ca_cert]
-          context.ca_file = options[:ssl_ca_cert]
-          context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      end
+
+      def set_cert_verification(context, options)
+        context.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        cert_store = OpenSSL::X509::Store.new
+        if options[:ssl_ca_cert]
+          cert_store.add_file(options[:ssl_ca_cert])
+        else
+          cert_store.set_default_paths
         end
-        context
+        context.cert_store = cert_store
       end
 
       def verify_certificate!(socket)

data/lib/mongo/socket/tcp.rb

@@ -43,7 +43,7 @@ module Mongo
       def connect!
         Timeout.timeout(timeout, Error::SocketTimeoutError) do
           socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
-          socket.connect(::Socket.pack_sockaddr_in(port, host))
+          handle_errors { socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           self
         end
       end
@@ -51,8 +51,8 @@ module Mongo
       # Initializes a new TCP socket.
       #
       # @example Create the TCP socket.
-      #   TCP.new('::1', 27017, 30)
-      #   TCP.new('127.0.0.1', 27017, 30)
+      #   TCP.new('::1', 27017, 30, Socket::PF_INET)
+      #   TCP.new('127.0.0.1', 27017, 30, Socket::PF_INET)
       #
       # @param [ String ] host The hostname or IP address.
       # @param [ Integer ] port The port number.

data/lib/mongo/socket/unix.rb

@@ -38,25 +38,22 @@ module Mongo
       #
       # @since 2.0.0
       def connect!
-        Timeout.timeout(timeout, Error::SocketTimeoutError) do
-          socket.connect(path)
-          self
-        end
+        self
       end
 
       # Initializes a new Unix socket.
       #
       # @example Create the Unix socket.
-      #   Unix.new('/path/to.sock', 27017, 30)
+      #   Unix.new('/path/to.sock', 5)
       #
       # @param [ String ] path The path.
       # @param [ Float ] timeout The socket timeout value.
-      # @param [ Integer ] family The socket family.
       #
       # @since 2.0.0
-      def initialize(path, timeout, family)
+      def initialize(path, timeout)
         @path, @timeout = path, timeout
-        super(family)
+        @socket = ::UNIXSocket.new(path)
+        set_socket_options(@socket)
       end
     end
   end

data/lib/mongo/socket.rb

@@ -54,7 +54,7 @@ module Mongo
     #
     # @return [ true, false ] If the socket is alive.
     #
-    # @since 2.0.0
+    # @deprecated Use #connectable? on the connection instead.
     def alive?
       sock_arr = [ @socket ]
       if Kernel::select(sock_arr, nil, sock_arr, 0)
@@ -172,11 +172,18 @@ module Mongo
       @socket.read(length) || String.new
     end
 
+    def unix_socket?(sock)
+      defined?(UNIXSocket) && sock.is_a?(UNIXSocket)
+    end
+
     def set_socket_options(sock)
-      encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
       sock.set_encoding(BSON::BINARY)
-      sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
-      sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+
+      unless unix_socket?(sock) && BSON::Environment.jruby?
+        encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
+        sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
+        sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+      end
     end
 
     def handle_errors