mongo 2.1.0.beta → 2.1.0.rc0

data/lib/mongo/index/view.rb

@@ -229,7 +229,7 @@ module Mongo
       end
 
       def initial_query_op
-        Operation::Read::Indexes.new(indexes_spec)
+        Operation::Indexes.new(indexes_spec)
       end
 
       def limit; -1; end

data/lib/mongo/loggable.rb

@@ -24,105 +24,82 @@ module Mongo
     # @since 2.0.0
     PREFIX = 'MONGODB'.freeze
 
-    # Log the operations. If a block is provided it will be yielded to,
-    # otherwise only the logging will take place.
-    #
-    # @example Log a query operation.
-    #   loggable.log(:debug, "MONGO.query", operations)
-    #
-    # @param [ Symbol ] level The log level.
-    # @param [ String ] prefix The prefix for the log line.
-    # @param [ Array<Object> ] operations The operations to log. The must
-    #   respond to #log_message.
-    #
-    # @return [ Object ] The result of the block or nil if no block given.
-    #
-    # @since 2.0.0
-    def log(level, prefix, operations)
-      started = Time.new
-      begin
-        yield(operations) if block_given?
-      rescue Exception => e
-        raise e
-      ensure
-        if Logger.allow?(level)
-          runtime = format("%.4fms", (Time.now.to_f - started.to_f) * 1000.0)
-          operations.each do |operation|
-            Logger.log(level, prefix, log_inspect(operation), runtime)
-          end
-        end
-      end
-    end
-
     # Convenience method to log debug messages with the standard prefix.
     #
     # @example Log a debug message.
-    #   log_debug([ 'Message' ])
+    #   log_debug('Message')
     #
-    # @param [ Array<Operation, String> ] operations The operations or messages
-    #   to log.
+    # @param [ String ] message The message to log.
     #
     # @since 2.0.0
-    def log_debug(operations, &block)
-      log(:debug, PREFIX, operations, &block)
+    def log_debug(message)
+      logger.debug(format_message(message)) if logger.debug?
     end
 
     # Convenience method to log error messages with the standard prefix.
     #
     # @example Log a error message.
-    #   log_error([ 'Message' ])
+    #   log_error('Message')
     #
-    # @param [ Array<Operation, String> ] operations The operations or messages
-    #   to log.
+    # @param [ String ] message The message to log.
     #
     # @since 2.0.0
-    def log_error(operations, &block)
-      log(:error, PREFIX, operations, &block)
+    def log_error(message)
+      logger.error(format_message(message)) if logger.error?
     end
 
     # Convenience method to log fatal messages with the standard prefix.
     #
     # @example Log a fatal message.
-    #   log_fatal([ 'Message' ])
+    #   log_fatal('Message')
     #
-    # @param [ Array<Operation, String> ] operations The operations or messages
-    #   to log.
+    # @param [ String ] message The message to log.
     #
     # @since 2.0.0
-    def log_fatal(operations, &block)
-      log(:fatal, PREFIX, operations, &block)
+    def log_fatal(message)
+      logger.fatal(format_message(message)) if logger.fatal?
     end
 
     # Convenience method to log info messages with the standard prefix.
     #
     # @example Log a info message.
-    #   log_info([ 'Message' ])
+    #   log_info('Message')
     #
-    # @param [ Array<Operation, String> ] operations The operations or messages
-    #   to log.
+    # @param [ String ] message The message to log.
     #
     # @since 2.0.0
-    def log_info(operations, &block)
-      log(:info, PREFIX, operations, &block)
+    def log_info(message)
+      logger.info(format_message(message)) if logger.info?
     end
 
     # Convenience method to log warn messages with the standard prefix.
     #
     # @example Log a warn message.
-    #   log_warn([ 'Message' ])
+    #   log_warn('Message')
     #
-    # @param [ Array<Operation, String> ] operations The operations or messages
-    #   to log.
+    # @param [ String ] message The message to log.
     #
     # @since 2.0.0
-    def log_warn(operations, &block)
-      log(:warn, PREFIX, operations, &block)
+    def log_warn(message)
+      logger.warn(format_message(message)) if logger.warn?
+    end
+
+    # Get the logger instance.
+    #
+    # @example Get the logger instance.
+    #   loggable.logger
+    #
+    # @return [ Logger ] The logger.
+    #
+    # @since 2.1.0
+    def logger
+      (options[:logger] || Logger.logger)
     end
 
     private
 
-    def log_inspect(operation)
-      operation.respond_to?(:log_message) ? operation.log_message : operation
+    def format_message(message)
+      format("%s | %s".freeze, PREFIX, message)
     end
   end
 end

data/lib/mongo/logger.rb

@@ -23,76 +23,6 @@ module Mongo
 
     class << self
 
-      # Log a debug level message.
-      #
-      # @example Log a debug level message.
-      #   Logger.debug('mongo', 'message', '10ms')
-      #
-      # @param [ String ] prefix The category prefix.
-      # @param [ String ] message The log message.
-      # @param [ String ] runtime The time of the operation.
-      #
-      # @since 2.0.0
-      def debug(prefix, message, runtime)
-        self.log(:debug, prefix, message, runtime)
-      end
-
-      # Log a error level message.
-      #
-      # @example Log a error level message.
-      #   Logger.error('mongo', 'message', '10ms')
-      #
-      # @param [ String ] prefix The category prefix.
-      # @param [ String ] message The log message.
-      # @param [ String ] runtime The time of the operation.
-      #
-      # @since 2.0.0
-      def error(prefix, message, runtime)
-        self.log(:error, prefix, message, runtime)
-      end
-
-      # Log a fatal level message.
-      #
-      # @example Log a fatal level message.
-      #   Logger.fatal('mongo', 'message', '10ms')
-      #
-      # @param [ String ] prefix The category prefix.
-      # @param [ String ] message The log message.
-      # @param [ String ] runtime The time of the operation.
-      #
-      # @since 2.0.0
-      def fatal(prefix, message, runtime)
-        self.log(:fatal, prefix, message, runtime)
-      end
-
-      # Log a info level message.
-      #
-      # @example Log a info level message.
-      #   Logger.info('mongo', 'message', '10ms')
-      #
-      # @param [ String ] prefix The category prefix.
-      # @param [ String ] message The log message.
-      # @param [ String ] runtime The time of the operation.
-      #
-      # @since 2.0.0
-      def info(prefix, message, runtime)
-        self.log(:info, prefix, message, runtime)
-      end
-
-      # Log a warn level message.
-      #
-      # @example Log a warn level message.
-      #   Logger.warn('mongo', 'message', '10ms')
-      #
-      # @param [ String ] prefix The category prefix.
-      # @param [ String ] message The log message.
-      # @param [ String ] runtime The time of the operation.
-      #
-      # @since 2.0.0
-      def warn(prefix, message, runtime)
-        self.log(:warn, prefix, message, runtime)
-      end
-
       # Get the wrapped logger. If none was set will return a default debug
       # level logger.
       #
@@ -120,18 +50,26 @@ module Mongo
         @logger = other
       end
 
-      def log(level, prefix, message, runtime)
-        logger.send(level, format("%s | %s | runtime: %s".freeze, prefix, message, runtime))
-      end
-
-      def allow?(level)
-        logger.send(:"#{level}?")
-      end
-
+      # Get the global logger level.
+      #
+      # @example Get the global logging level.
+      #   Mongo::Logger.level
+      #
+      # @return [ Integer ] The log level.
+      #
+      # @since 2.0.0
       def level
         logger.level
       end
 
+      # Set the global logger level.
+      #
+      # @example Set the global logging level.
+      #   Mongo::Logger.level == Logger::DEBUG
+      #
+      # @return [ Integer ] The log level.
+      #
+      # @since 2.0.0
       def level=(level)
         logger.level = level
       end

data/lib/mongo/monitoring.rb

@@ -83,11 +83,6 @@ module Mongo
       end
     end
 
-    # Adds our internal command logging to the global subscribers.
-    #
-    # @since 2.1.0
-    Global.subscribe(COMMAND, CommandLogSubscriber.new)
-
     # Initialize the monitoring.
     #
     # @api private
@@ -105,6 +100,7 @@ module Mongo
             subscribe(topic, subscriber)
           end
         end
+        subscribe(COMMAND, CommandLogSubscriber.new(options))
       end
     end
 

data/lib/mongo/monitoring/command_log_subscriber.rb

@@ -19,6 +19,10 @@ module Mongo
     #
     # @since 2.1.0
     class CommandLogSubscriber
+      include Loggable
+
+      # @return [ Hash ] options The options.
+      attr_reader :options
 
       # Constant for the max number of characters to print when inspecting
       # a query field.
@@ -26,6 +30,20 @@ module Mongo
       # @since 2.1.0
       LOG_STRING_LIMIT = 250
 
+      # Create the new log subscriber.
+      #
+      # @example Create the log subscriber.
+      #   CommandLogSubscriber.new
+      #
+      # @param [ Hash ] options The options.
+      #
+      # @option options [ Logger ] :logger An optional custom logger.
+      #
+      # @since 2.1.0
+      def initialize(options = {})
+        @options = options
+      end
+
       # Handle the command started event.
       #
       # @example Handle the event.
@@ -35,9 +53,7 @@ module Mongo
       #
       # @since 2.1.0
       def started(event)
-        if Logger.logger.debug?
-          log("#{prefix(event)} | STARTED | #{format(event.command)}")
-        end
+        log_debug("#{prefix(event)} | STARTED | #{format_command(event.command)}")
       end
 
       # Handle the command succeeded event.
@@ -49,9 +65,7 @@ module Mongo
       #
       # @since 2.1.0
       def succeeded(event)
-        if Logger.logger.debug?
-          log("#{prefix(event)} | SUCCEEDED | #{event.duration}s")
-        end
+        log_debug("#{prefix(event)} | SUCCEEDED | #{event.duration}s")
       end
 
       # Handle the command failed event.
@@ -63,25 +77,29 @@ module Mongo
       #
       # @since 2.1.0
       def failed(event)
-        if Logger.logger.debug?
-          log("#{prefix(event)} | FAILED | #{event.message} | #{event.duration}s")
-        end
+        log_debug("#{prefix(event)} | FAILED | #{event.message} | #{event.duration}s")
       end
 
       private
 
-      def format(args)
-        ((s = args.inspect).length > LOG_STRING_LIMIT) ? "#{s[0..LOG_STRING_LIMIT]}..." : s
-      rescue ArgumentError
-        '<Unable to inspect arguments>'
+      def format_command(args)
+        begin
+          truncating? ? truncate(args) : args.inspect
+        rescue Exception
+          '<Unable to inspect arguments>'
+        end
+      end
+
+      def prefix(event)
+        "#{event.address.to_s} | #{event.database_name}.#{event.command_name}"
       end
 
-      def log(message)
-        Logger.logger.debug(message)
+      def truncate(command)
+        ((s = command.inspect).length > LOG_STRING_LIMIT) ? "#{s[0..LOG_STRING_LIMIT]}..." : s
       end
 
-      def prefix(event)
-        "MONGODB | #{event.address.to_s} | #{event.database_name}.#{event.command_name}"
+      def truncating?
+        @truncating ||= (options[:truncate_logs] != false)
       end
     end
   end

data/lib/mongo/monitoring/event/command_succeeded.rb

@@ -86,10 +86,29 @@ module Mongo
             address,
             command_payload[:request_id],
             operation_id,
-            reply_payload ? reply_payload[:reply] : nil,
+            generate_reply(command_payload, reply_payload),
             duration
           )
         end
+
+        private
+
+        def self.generate_reply(command_payload, reply_payload)
+          if reply_payload
+            reply = reply_payload[:reply]
+            if cursor = reply[:cursor]
+              reply = reply.merge(cursor: cursor.merge(ns: namespace(command_payload)))
+            end
+            reply
+          else
+            BSON::Document.new(ok: 1)
+          end
+        end
+
+        def self.namespace(payload)
+          command = payload[:command]
+          "#{payload[:database_name]}.#{command[:collection] || command.values.first}"
+        end
       end
     end
   end

data/lib/mongo/monitoring/publishable.rb

@@ -37,14 +37,20 @@ module Mongo
       # @since 2.1.0
       def publish_command(messages, operation_id = Monitoring.next_operation_id)
         start = Time.now
-        payload = messages.first.payload
+        message = messages.first
+        message.set_request_id
+        payload = message.payload
+        send_duration = duration(start)
         command_started(address, operation_id, payload)
+        receive_start = Time.now
         begin
           result = yield(messages)
-          command_completed(result, address, operation_id, payload, start)
+          total_duration = duration(receive_start) + send_duration
+          command_completed(result, address, operation_id, payload, total_duration)
           result
         rescue Exception => e
-          command_failed(address, operation_id, payload, e.message, start)
+          total_duration = duration(receive_start) + send_duration
+          command_failed(address, operation_id, payload, e.message, total_duration)
           raise e
         end
       end
@@ -58,17 +64,17 @@ module Mongo
         )
       end
 
-      def command_completed(result, address, operation_id, payload, start)
+      def command_completed(result, address, operation_id, payload, duration)
         document = result ? (result.documents || []).first : nil
-        parser = Error::Parser.new(document)
-        if parser.message.empty?
-          command_succeeded(result, address, operation_id, payload, start)
+        if error?(document)
+          parser = Error::Parser.new(document)
+          command_failed(address, operation_id, payload, parser.message, duration)
         else
-          command_failed(address, operation_id, payload, parser.message, start)
+          command_succeeded(result, address, operation_id, payload, duration)
         end
       end
 
-      def command_succeeded(result, address, operation_id, payload, start)
+      def command_succeeded(result, address, operation_id, payload, duration)
         monitoring.succeeded(
           Monitoring::COMMAND,
           Event::CommandSucceeded.generate(
@@ -76,21 +82,25 @@ module Mongo
             operation_id,
             payload,
             result ? result.payload : nil,
-            duration(start)
+            duration
           )
         )
       end
 
-      def command_failed(address, operation_id, payload, message, start)
+      def command_failed(address, operation_id, payload, message, duration)
         monitoring.failed(
           Monitoring::COMMAND,
-          Event::CommandFailed.generate(address, operation_id, payload, message, duration(start))
+          Event::CommandFailed.generate(address, operation_id, payload, message, duration)
         )
       end
 
       def duration(start)
         Time.now - start
       end
+
+      def error?(document)
+        document && (document['ok'] == 0 || document.key?('$err'))
+      end
     end
   end
 end