fluent-plugin-mongo 0.7.0 → 0.7.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 223d88d3a35d00c18254bda1ffe8320900a5e76a
+  data.tar.gz: 5581a2106b77d3797dd6f0e67310a7e21305aafa
+SHA512:
+  metadata.gz: a0b6292750fb0bcad9079ee182591fa6b0ac35d009931b240b7d5403890f22955df8f7f45782b476f1160e10ebf2f92b5e19dc525b937e151eb200d7de8e1aaa
+  data.tar.gz: 8ff33a0383a02d5b6b34418b9738a1afbd527eaaab67b33e9bc334e73854d3859eaaa4386215bab455fa0638ce6def3a6822b92a516b7f68a596d2a9a34fef4e

data/ChangeLog

@@ -1,4 +1,11 @@
-Release 0.7.0 - 2012/03/20
+Release 0.7.1 - 2013/07/31
+
+	* Fix incomprehensible code indent
+	* Remove mongo_backup output
+	* Fix getting version from mongod for broken mongod support
+
+
+Release 0.7.0 - 2013/03/20
 
 	* Upgrade mongo gem least version to 1.8
 	* Upgrade fluentd gem least version to 0.10.9
@@ -7,7 +14,7 @@ Release 0.7.0 - 2012/03/20
 	* Change buffer_chunk_limit to 8MB when mongod version is 1.8 or later.
 
 
-Release 0.6.13 - 2012/01/15
+Release 0.6.13 - 2013/01/15
 
 	* Add exclude_broken_fields config to output plugins
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -1,146 +1,142 @@
 module Fluent
+  class MongoTailInput < Input
+    Plugin.register_input('mongo_tail', self)
+
+    require 'fluent/plugin/mongo_util'
+    include MongoUtil
+
+    config_param :database, :string
+    config_param :collection, :string
+    config_param :host, :string, :default => 'localhost'
+    config_param :port, :integer, :default => 27017
+    config_param :wait_time, :integer, :default => 1
+
+    config_param :tag, :string, :default => nil
+    config_param :tag_key, :string, :default => nil
+    config_param :time_key, :string, :default => nil
+    config_param :time_format, :string, :default => nil
+
+    # To store last ObjectID
+    config_param :id_store_file, :string, :default => nil
+
+    def initialize
+      super
+      require 'mongo'
+      require 'bson'
+    end
 
+    def configure(conf)
+      super
 
-class MongoTailInput < Input
-  Plugin.register_input('mongo_tail', self)
-
-  require 'fluent/plugin/mongo_util'
-  include MongoUtil
-
-  config_param :database, :string
-  config_param :collection, :string
-  config_param :host, :string, :default => 'localhost'
-  config_param :port, :integer, :default => 27017
-  config_param :wait_time, :integer, :default => 1
+      if !@tag and !@tag_key
+        raise ConfigError, "'tag' or 'tag_key' option is required on mongo_tail input"
+      end
 
-  config_param :tag, :string, :default => nil
-  config_param :tag_key, :string, :default => nil
-  config_param :time_key, :string, :default => nil
-  config_param :time_format, :string, :default => nil
+      @last_id = @id_store_file ? get_last_id : nil
 
-  # To store last ObjectID
-  config_param :id_store_file, :string, :default => nil
+      $log.debug "Setup mongo_tail configuration: mode = #{@id_store_file ? 'persistent' : 'non-persistent'}"
+    end
 
-  def initialize
-    super
-    require 'mongo'
-    require 'bson'
-  end
+    def start
+      super
+      @file = get_id_store_file if @id_store_file
+      @client = get_capped_collection
+      @thread = Thread.new(&method(:run))
+    end
 
-  def configure(conf)
-    super
+    def shutdown
+      if @id_store_file
+        save_last_id
+        @file.close
+      end
 
-    if !@tag and !@tag_key
-      raise ConfigError, "'tag' or 'tag_key' option is required on mongo_tail input"
+      @thread.join
+      @client.db.connection.close
+      super
     end
 
-    @last_id = @id_store_file ? get_last_id : nil
+    def run
+      loop {
+        tailoop(Mongo::Cursor.new(@client, cursor_conf))
+      }
+    end
 
-    $log.debug "Setup mongo_tail configuration: mode = #{@id_store_file ? 'persistent' : 'non-persistent'}"
-  end
+    private
+
+    def get_capped_collection
+      begin
+        db = authenticate(Mongo::Connection.new(@host, @port).db(@database))
+        raise ConfigError, "'#{@database}.#{@collection}' not found: node = #{@host}:#{@port}" unless db.collection_names.include?(@collection)
+        collection = db.collection(@collection)
+        raise ConfigError, "'#{@database}.#{@collection}' is not capped: node = #{@host}:#{@port}" unless collection.capped?
+        collection
+      rescue Mongo::ConnectionFailure => e
+        $log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
+        exit!
+      rescue Mongo::OperationFailure => e
+        $log.fatal "Operation failed. Probably, 'mongod' needs an authentication: #{e}"
+        exit!
+      end
+    end
 
-  def start
-    super
-    @file = get_id_store_file if @id_store_file
-    @client = get_capped_collection
-    @thread = Thread.new(&method(:run))
-  end
+    def tailoop(cursor)
+      loop {
+        cursor = Mongo::Cursor.new(@client, cursor_conf) unless cursor.alive?
+        if doc = cursor.next_document
+          time = if @time_key
+                   t = doc.delete(@time_key)
+                   t.nil? ? Engine.now : t.to_i
+                 else
+                   Engine.now
+                 end
+          tag = if @tag_key
+                  t = doc.delete(@tag_key)
+                  t.nil? ? 'mongo.missing_tag' : t
+                else
+                  @tag
+                end
+          if id = doc.delete('_id')
+            @last_id = id.to_s
+            doc['_id_str'] = @last_id
+            save_last_id if @id_store_file
+          end
+
+          # Should use MultiEventStream?
+          Engine.emit(tag, time, doc)
+        else
+          sleep @wait_time
+        end
+      }
+    rescue
+      # ignore Mongo::OperationFailuer at CURSOR_NOT_FOUND
+    end
 
-  def shutdown
-    if @id_store_file
-      save_last_id
-      @file.close
+    def cursor_conf
+      conf = {}
+      conf[:tailable] = true
+      conf[:selector] = {'_id' => {'$gt' => BSON::ObjectId(@last_id)}} if @last_id
+      conf
     end
 
-    @thread.join
-    @client.db.connection.close
-    super
-  end
+    # following methods are used when id_store_file is true
 
-  def run
-    loop {
-      tailoop(Mongo::Cursor.new(@client, cursor_conf))
-    }
-  end
-
-  private
-
-  def get_capped_collection
-    begin
-      db = authenticate(Mongo::Connection.new(@host, @port).db(@database))
-      raise ConfigError, "'#{@database}.#{@collection}' not found: node = #{@host}:#{@port}" unless db.collection_names.include?(@collection)
-      collection = db.collection(@collection)
-      raise ConfigError, "'#{@database}.#{@collection}' is not capped: node = #{@host}:#{@port}" unless collection.capped?
-      collection
-    rescue Mongo::ConnectionFailure => e
-      $log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
-      exit!
-    rescue Mongo::OperationFailure => e
-      $log.fatal "Operation failed. Probably, 'mongod' needs an authentication: #{e}"
-      exit!
+    def get_id_store_file
+      file = File.open(@id_store_file, 'w')
+      file.sync
+      file
     end
-  end
-
-  def tailoop(cursor)
-    loop {
-      cursor = Mongo::Cursor.new(@client, cursor_conf) unless cursor.alive?
-      if doc = cursor.next_document
-        time = if @time_key
-                 t = doc.delete(@time_key)
-                 t.nil? ? Engine.now : t.to_i
-               else
-                 Engine.now
-               end
-        tag = if @tag_key
-                t = doc.delete(@tag_key)
-                t.nil? ? 'mongo.missing_tag' : t
-              else
-                @tag
-              end
-        if id = doc.delete('_id')
-          @last_id = id.to_s
-          doc['_id_str'] = @last_id
-          save_last_id if @id_store_file
-        end
 
-        # Should use MultiEventStream?
-        Engine.emit(tag, time, doc)
+    def get_last_id
+      if File.exist?(@id_store_file)
+        BSON::ObjectId(File.read(@id_store_file)).to_s rescue nil
       else
-        sleep @wait_time
+        nil
       end
-    }
-  rescue
-    # ignore Mongo::OperationFailuer at CURSOR_NOT_FOUND
-  end
-
-  def cursor_conf
-    conf = {}
-    conf[:tailable] = true
-    conf[:selector] = {'_id' => {'$gt' => BSON::ObjectId(@last_id)}} if @last_id
-    conf
-  end
-
-  # following methods are used when id_store_file is true
-
-  def get_id_store_file
-    file = File.open(@id_store_file, 'w')
-    file.sync
-    file
-  end
-
-  def get_last_id
-    if File.exist?(@id_store_file)
-      BSON::ObjectId(File.read(@id_store_file)).to_s rescue nil
-    else
-      nil
     end
-  end
 
-  def save_last_id
-    @file.pos = 0
-    @file.write(@last_id)
+    def save_last_id
+      @file.pos = 0
+      @file.write(@last_id)
+    end
   end
 end
-
-
-end

data/lib/fluent/plugin/out_mongo.rb

@@ -1,231 +1,235 @@
 module Fluent
+  class MongoOutput < BufferedOutput
+    Plugin.register_output('mongo', self)
 
+    require 'fluent/plugin/mongo_util'
+    include MongoUtil
 
-class MongoOutput < BufferedOutput
-  Fluent::Plugin.register_output('mongo', self)
+    include SetTagKeyMixin
+    config_set_default :include_tag_key, false
 
-  require 'fluent/plugin/mongo_util'
-  include MongoUtil
+    include SetTimeKeyMixin
+    config_set_default :include_time_key, true
 
-  include SetTagKeyMixin
-  config_set_default :include_tag_key, false
+    config_param :database, :string
+    config_param :collection, :string, :default => 'untagged'
+    config_param :host, :string, :default => 'localhost'
+    config_param :port, :integer, :default => 27017
+    config_param :ignore_invalid_record, :bool, :default => false
+    config_param :disable_collection_check, :bool, :default => nil
+    config_param :exclude_broken_fields, :string, :default => nil
+    config_param :write_concern, :integer, :default => nil
 
-  include SetTimeKeyMixin
-  config_set_default :include_time_key, true
+    # tag mapping mode
+    config_param :tag_mapped, :bool, :default => false
+    config_param :remove_tag_prefix, :string, :default => nil
 
-  config_param :database, :string
-  config_param :collection, :string, :default => 'untagged'
-  config_param :host, :string, :default => 'localhost'
-  config_param :port, :integer, :default => 27017
-  config_param :ignore_invalid_record, :bool, :default => false
-  config_param :disable_collection_check, :bool, :default => nil
-  config_param :exclude_broken_fields, :string, :default => nil
-  config_param :write_concern, :integer, :default => nil
+    attr_reader :collection_options, :connection_options
 
-  # tag mapping mode
-  config_param :tag_mapped, :bool, :default => false
-  config_param :remove_tag_prefix, :string, :default => nil
+    def initialize
+      super
+      require 'mongo'
+      require 'msgpack'
 
-  attr_reader :collection_options, :connection_options
-
-  def initialize
-    super
-    require 'mongo'
-    require 'msgpack'
+      @clients = {}
+      @connection_options = {}
+      @collection_options = {:capped => false}
+    end
 
-    @clients = {}
-    @connection_options = {}
-    @collection_options = {:capped => false}
-  end
+    def configure(conf)
+      super
 
-  def configure(conf)
-    super
+      if conf.has_key?('tag_mapped')
+        @tag_mapped = true
+        @disable_collection_check = true if @disable_collection_check.nil?
+      else
+        @disable_collection_check = false if @disable_collection_check.nil?
+      end
+      raise ConfigError, "normal mode requires collection parameter" if !@tag_mapped and !conf.has_key?('collection')
 
-    if conf.has_key?('tag_mapped')
-      @tag_mapped = true
-      @disable_collection_check = true if @disable_collection_check.nil?
-    else
-      @disable_collection_check = false if @disable_collection_check.nil?
-    end
-    raise ConfigError, "normal mode requires collection parameter" if !@tag_mapped and !conf.has_key?('collection')
+      if remove_tag_prefix = conf['remove_tag_prefix']
+        @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_tag_prefix))
+      end
 
-    if remove_tag_prefix = conf['remove_tag_prefix']
-      @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_tag_prefix))
-    end
+      @exclude_broken_fields = @exclude_broken_fields.split(',') if @exclude_broken_fields
 
-    @exclude_broken_fields = @exclude_broken_fields.split(',') if @exclude_broken_fields
+      if conf.has_key?('capped')
+        raise ConfigError, "'capped_size' parameter is required on <store> of Mongo output" unless conf.has_key?('capped_size')
+        @collection_options[:capped] = true
+        @collection_options[:size] = Config.size_value(conf['capped_size'])
+        @collection_options[:max] = Config.size_value(conf['capped_max']) if conf.has_key?('capped_max')
+      end
 
-    if conf.has_key?('capped')
-      raise ConfigError, "'capped_size' parameter is required on <store> of Mongo output" unless conf.has_key?('capped_size')
-      @collection_options[:capped] = true
-      @collection_options[:size] = Config.size_value(conf['capped_size'])
-      @collection_options[:max] = Config.size_value(conf['capped_max']) if conf.has_key?('capped_max')
-    end
+      @connection_options[:w] = @write_concern unless @write_concern.nil?
 
-    @connection_options[:w] = @write_concern unless @write_concern.nil?
+      # MongoDB uses BSON's Date for time.
+      def @timef.format_nocache(time)
+        time
+      end
 
-    # MongoDB uses BSON's Date for time.
-    def @timef.format_nocache(time)
-      time
+      $log.debug "Setup mongo configuration: mode = #{@tag_mapped ? 'tag mapped' : 'normal'}"
     end
 
-    $log.debug "Setup mongo configuration: mode = #{@tag_mapped ? 'tag mapped' : 'normal'}"
-  end
-
-  def start
-    # Non tag mapped mode, we can check collection configuration before server start.
-    get_or_create_collection(@collection) unless @tag_mapped
+    def start
+      # Non tag mapped mode, we can check collection configuration before server start.
+      get_or_create_collection(@collection) unless @tag_mapped
 
-    # From configure for avoding complex method dependency...
-    @buffer.buffer_chunk_limit = available_buffer_chunk_limit
+      # From configure for avoding complex method dependency...
+      @buffer.buffer_chunk_limit = available_buffer_chunk_limit
 
-    super
-  end
+      super
+    end
 
-  def shutdown
-    # Mongo::Connection checks alive or closed myself
-    @clients.values.each { |client| client.db.connection.close }
-    super
-  end
+    def shutdown
+      # Mongo::Connection checks alive or closed myself
+      @clients.values.each { |client| client.db.connection.close }
+      super
+    end
 
-  def format(tag, time, record)
-    [time, record].to_msgpack
-  end
+    def format(tag, time, record)
+      [time, record].to_msgpack
+    end
 
-  def emit(tag, es, chain)
-    # TODO: Should replacement using eval in configure?
-    if @tag_mapped
-      super(tag, es, chain, tag)
-    else
-      super(tag, es, chain)
+    def emit(tag, es, chain)
+      # TODO: Should replacement using eval in configure?
+      if @tag_mapped
+        super(tag, es, chain, tag)
+      else
+        super(tag, es, chain)
+      end
     end
-  end
 
-  def write(chunk)
-    # TODO: See emit comment
-    collection_name = @tag_mapped ? chunk.key : @collection
-    operate(get_or_create_collection(collection_name), collect_records(chunk))
-  end
+    def write(chunk)
+      # TODO: See emit comment
+      collection_name = @tag_mapped ? chunk.key : @collection
+      operate(get_or_create_collection(collection_name), collect_records(chunk))
+    end
 
-  private
+    private
 
-  INSERT_ARGUMENT = {:collect_on_error => true}
-  BROKEN_DATA_KEY = '__broken_data'
+    INSERT_ARGUMENT = {:collect_on_error => true}
+    BROKEN_DATA_KEY = '__broken_data'
 
-  def operate(collection, records)
-    begin
-      record_ids, error_records = collection.insert(records, INSERT_ARGUMENT)
-      if !@ignore_invalid_record and error_records.size > 0
-        operate_invalid_records(collection, error_records)
-      end
-    rescue Mongo::OperationFailure => e
-      # Probably, all records of _records_ are broken...
-      if e.error_code == 13066  # 13066 means "Message contains no documents"
-        operate_invalid_records(collection, records) unless @ignore_invalid_record
-      else
-        raise e
+    def operate(collection, records)
+      begin
+        record_ids, error_records = collection.insert(records, INSERT_ARGUMENT)
+        if !@ignore_invalid_record and error_records.size > 0
+          operate_invalid_records(collection, error_records)
+        end
+      rescue Mongo::OperationFailure => e
+        # Probably, all records of _records_ are broken...
+        if e.error_code == 13066  # 13066 means "Message contains no documents"
+          operate_invalid_records(collection, records) unless @ignore_invalid_record
+        else
+          raise e
+        end
       end
+      records
     end
-    records
-  end
 
-  def operate_invalid_records(collection, records)
-    converted_records = records.map { |record|
-      new_record = {}
-      new_record[@tag_key] = record.delete(@tag_key) if @include_tag_key
-      new_record[@time_key] = record.delete(@time_key)
-      if @exclude_broken_fields
-        @exclude_broken_fields.each { |key|
-          new_record[key] = record.delete(key)
-        }
-      end
-      new_record[BROKEN_DATA_KEY] = BSON::Binary.new(Marshal.dump(record))
-      new_record
-    }
-    collection.insert(converted_records)
-  end
+    def operate_invalid_records(collection, records)
+      converted_records = records.map { |record|
+        new_record = {}
+        new_record[@tag_key] = record.delete(@tag_key) if @include_tag_key
+        new_record[@time_key] = record.delete(@time_key)
+        if @exclude_broken_fields
+          @exclude_broken_fields.each { |key|
+            new_record[key] = record.delete(key)
+          }
+        end
+        new_record[BROKEN_DATA_KEY] = BSON::Binary.new(Marshal.dump(record))
+        new_record
+      }
+      collection.insert(converted_records)
+    end
 
-  def collect_records(chunk)
-    records = []
-    chunk.msgpack_each { |time, record|
-      record[@time_key] = Time.at(time || record[@time_key]) if @include_time_key
-      records << record
-    }
-    records
-  end
+    def collect_records(chunk)
+      records = []
+      chunk.msgpack_each { |time, record|
+        record[@time_key] = Time.at(time || record[@time_key]) if @include_time_key
+        records << record
+      }
+      records
+    end
 
-  FORMAT_COLLECTION_NAME_RE = /(^\.+)|(\.+$)/
+    FORMAT_COLLECTION_NAME_RE = /(^\.+)|(\.+$)/
 
-  def format_collection_name(collection_name)
-    formatted = collection_name
-    formatted = formatted.gsub(@remove_tag_prefix, '') if @remove_tag_prefix
-    formatted = formatted.gsub(FORMAT_COLLECTION_NAME_RE, '')
-    formatted = @collection if formatted.size == 0 # set default for nil tag
-    formatted
-  end
+    def format_collection_name(collection_name)
+      formatted = collection_name
+      formatted = formatted.gsub(@remove_tag_prefix, '') if @remove_tag_prefix
+      formatted = formatted.gsub(FORMAT_COLLECTION_NAME_RE, '')
+      formatted = @collection if formatted.size == 0 # set default for nil tag
+      formatted
+    end
 
-  def get_or_create_collection(collection_name)
-    collection_name = format_collection_name(collection_name)
-    return @clients[collection_name] if @clients[collection_name]
-
-    @db ||= get_connection
-    if @db.collection_names.include?(collection_name)
-      collection = @db.collection(collection_name)
-      unless @disable_collection_check
-        capped = collection.capped?
-        unless @collection_options[:capped] == capped # TODO: Verify capped configuration
-          new_mode = format_collection_mode(@collection_options[:capped])
-          old_mode = format_collection_mode(capped)
-          raise ConfigError, "New configuration is different from existing collection: new = #{new_mode}, old = #{old_mode}"
+    def get_or_create_collection(collection_name)
+      collection_name = format_collection_name(collection_name)
+      return @clients[collection_name] if @clients[collection_name]
+
+      @db ||= get_connection
+      if @db.collection_names.include?(collection_name)
+        collection = @db.collection(collection_name)
+        unless @disable_collection_check
+          capped = collection.capped?
+          unless @collection_options[:capped] == capped # TODO: Verify capped configuration
+            new_mode = format_collection_mode(@collection_options[:capped])
+            old_mode = format_collection_mode(capped)
+            raise ConfigError, "New configuration is different from existing collection: new = #{new_mode}, old = #{old_mode}"
+          end
         end
+      else
+        collection = @db.create_collection(collection_name, @collection_options)
       end
-    else
-      collection = @db.create_collection(collection_name, @collection_options)
+
+      @clients[collection_name] = collection
     end
 
-    @clients[collection_name] = collection
-  end
+    def format_collection_mode(mode)
+      mode ? 'capped' : 'normal'
+    end
 
-  def format_collection_mode(mode)
-    mode ? 'capped' : 'normal'
-  end
+    def get_connection
+      db = Mongo::MongoClient.new(@host, @port, @connection_options).db(@database)
+      authenticate(db)
+    end
 
-  def get_connection
-    db = Mongo::MongoClient.new(@host, @port, @connection_options).db(@database)
-    authenticate(db)
-  end
+    # Following limits are heuristic. BSON is sometimes bigger than MessagePack and JSON.
+    LIMIT_BEFORE_v1_8 = 2 * 1024 * 1024  # 2MB = 4MB  / 2
+    LIMIT_AFTER_v1_8 =  8 * 1024 * 1024  # 8MB = 16MB / 2
+
+    def available_buffer_chunk_limit
+      begin
+        limit = mongod_version >= "1.8.0" ? LIMIT_AFTER_v1_8 : LIMIT_BEFORE_v1_8
+      rescue Mongo::ConnectionFailure => e
+        $log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
+        exit!
+      rescue Mongo::OperationFailure => e
+        $log.fatal "Operation failed. Probably, 'mongod' needs an authentication: #{e}"
+        exit!
+      rescue Exception => e
+        $log.warn "mongo unknown error #{e}, set #{LIMIT_BEFORE_v1_8} to chunk limit"
+        limit = LIMIT_BEFORE_v1_8
+      end
 
-  # Following limits are heuristic. BSON is sometimes bigger than MessagePack and JSON.
-  LIMIT_BEFORE_v1_8 = 2 * 1024 * 1024  # 2MB = 4MB  / 2
-  LIMIT_AFTER_v1_8 =  8 * 1024 * 1024  # 8MB = 16MB / 2
-
-  def available_buffer_chunk_limit
-    begin
-      limit = mongod_version >= "1.8.0" ? LIMIT_AFTER_v1_8 : LIMIT_BEFORE_v1_8
-    rescue Mongo::ConnectionFailure => e
-      $log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
-      exit!
-    rescue Mongo::OperationFailure => e
-      $log.fatal "Operation failed. Probably, 'mongod' needs an authentication: #{e}"
-      exit!
-    rescue Exception => e
-      $log.warn "mongo unknown error #{e}, set #{LIMIT_BEFORE_v1_8} to chunk limit"
-      limit = LIMIT_BEFORE_v1_8
-    end
-
-    if @buffer.buffer_chunk_limit > limit
-      $log.warn ":buffer_chunk_limit(#{@buffer.buffer_chunk_limit}) is large. Reset :buffer_chunk_limit with #{limit}"
-      limit
-    else
-      @buffer.buffer_chunk_limit
+      if @buffer.buffer_chunk_limit > limit
+        $log.warn ":buffer_chunk_limit(#{@buffer.buffer_chunk_limit}) is large. Reset :buffer_chunk_limit with #{limit}"
+        limit
+      else
+        @buffer.buffer_chunk_limit
+      end
     end
-  end
 
-  def mongod_version
-    db = get_connection
-    db.command('buildInfo' => 1)['version']
-  end
-end
+    def mongod_version
+      version = nil
 
+      begin
+        version = get_connection.command('buildInfo' => 1)['version']
+      rescue Mongo::OperationFailure
+        # fallback for buggy mongod version support
+        version = authenticate(Mongo::MongoClient.new(@host, @port, @connection_options).db('admin')).command('buildInfo' => 1)['version']
+      end
 
+      version
+    end
+  end
 end

data/lib/fluent/plugin/out_mongo_replset.rb

@@ -1,73 +1,69 @@
 require 'fluent/plugin/out_mongo'
 
 module Fluent
-
-
-class MongoOutputReplset < MongoOutput
-  Fluent::Plugin.register_output('mongo_replset', self)
-
-  config_param :nodes, :string
-  config_param :name, :string, :default => nil
-  config_param :read, :string, :default => nil
-  config_param :refresh_mode, :string, :default => nil
-  config_param :refresh_interval, :integer, :default => nil
-  config_param :num_retries, :integer, :default => 60
-
-  # disable single node configuration
-  config_param :host, :string, :default => nil
-  config_param :port, :integer, :default => nil
-
-  def configure(conf)
-    super
-
-    @nodes = parse_nodes(conf['nodes'])
-    if name = conf['name']
-      @connection_options[:name] = conf['name']
-    end
-    if read = conf['read']
-      @connection_options[:read] = read.to_sym
-    end
-    if refresh_mode = conf['refresh_mode']
-      @connection_options[:refresh_mode] = refresh_mode.to_sym
+  class MongoOutputReplset < MongoOutput
+    Plugin.register_output('mongo_replset', self)
+
+    config_param :nodes, :string
+    config_param :name, :string, :default => nil
+    config_param :read, :string, :default => nil
+    config_param :refresh_mode, :string, :default => nil
+    config_param :refresh_interval, :integer, :default => nil
+    config_param :num_retries, :integer, :default => 60
+
+    # disable single node configuration
+    config_param :host, :string, :default => nil
+    config_param :port, :integer, :default => nil
+
+    def configure(conf)
+      super
+
+      @nodes = parse_nodes(conf['nodes'])
+      if name = conf['name']
+        @connection_options[:name] = conf['name']
+      end
+      if read = conf['read']
+        @connection_options[:read] = read.to_sym
+      end
+      if refresh_mode = conf['refresh_mode']
+        @connection_options[:refresh_mode] = refresh_mode.to_sym
+      end
+      if refresh_interval = conf['refresh_interval']
+        @connection_options[:refresh_interval] = refresh_interval
+      end
+
+      $log.debug "Setup replica set configuration: nodes = #{conf['nodes']}"
     end
-    if refresh_interval = conf['refresh_interval']
-      @connection_options[:refresh_interval] = refresh_interval
-    end
-
-    $log.debug "Setup replica set configuration: nodes = #{conf['nodes']}"
-  end
 
-  private
+    private
 
-  def operate(collection, records)
-    rescue_connection_failure do
-      super(collection, records)
+    def operate(collection, records)
+      rescue_connection_failure do
+        super(collection, records)
+      end
     end
-  end
 
-  def parse_nodes(nodes)
-    nodes.split(',')
-  end
-
-  def get_connection
-    db = Mongo::MongoReplicaSetClient.new(@nodes, @connection_options).db(@database)
-    authenticate(db)
-  end
+    def parse_nodes(nodes)
+      nodes.split(',')
+    end
 
-  def rescue_connection_failure
-    retries = 0
-    begin
-      yield
-    rescue Mongo::ConnectionFailure => e
-      retries += 1
-      raise e if retries > @num_retries
+    def get_connection
+      db = Mongo::MongoReplicaSetClient.new(@nodes, @connection_options).db(@database)
+      authenticate(db)
+    end
 
-      $log.warn "Failed to connect to Replica Set. Try to retry: retry number = #{retries}"
-      sleep 0.5
-      retry
+    def rescue_connection_failure
+      retries = 0
+      begin
+        yield
+      rescue Mongo::ConnectionFailure => e
+        retries += 1
+        raise e if retries > @num_retries
+
+        $log.warn "Failed to connect to Replica Set. Try to retry: retry number = #{retries}"
+        sleep 0.5
+        retry
+      end
     end
   end
 end
-
-
-end

data/lib/fluent/plugin/out_mongo_tag_collection.rb

@@ -1,24 +1,20 @@
 require 'fluent/plugin/out_mongo'
 
 module Fluent
+  class MongoOutputTagCollection < MongoOutput
+    Plugin.register_output('mongo_tag_collection', self)
 
+    config_param :collection, :string, :default => 'untagged'
 
-class MongoOutputTagCollection < MongoOutput
-  Fluent::Plugin.register_output('mongo_tag_collection', self)
+    def configure(conf)
+      super
 
-  config_param :collection, :string, :default => 'untagged'
+      @tag_mapped = true
+      if remove_prefix_collection = conf['remove_prefix_collection']
+        @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_prefix_collection))
+      end
 
-  def configure(conf)
-    super
-
-    @tag_mapped = true
-    if remove_prefix_collection = conf['remove_prefix_collection']
-      @remove_tag_prefix = Regexp.new('^' + Regexp.escape(remove_prefix_collection))
+      $log.warn "'mongo_tag_collection' deprecated. Please use 'mongo' type with 'tag_mapped' parameter"
     end
-
-    $log.warn "'mongo_tag_collection' deprecated. Please use 'mongo' type with 'tag_mapped' parameter"
   end
 end
-
-
-end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,49 +41,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: MongoDB plugin for Fluent event collector
@@ -112,7 +101,6 @@ files:
 - lib/fluent/plugin/in_mongo_tail.rb
 - lib/fluent/plugin/mongo_util.rb
 - lib/fluent/plugin/out_mongo.rb
-- lib/fluent/plugin/out_mongo_backup.rb
 - lib/fluent/plugin/out_mongo_replset.rb
 - lib/fluent/plugin/out_mongo_tag_collection.rb
 - test/plugin/in_mongo_tail.rb
@@ -124,33 +112,26 @@ files:
 - test/tools/rs_test_helper.rb
 homepage: https://github.com/fluent/fluent-plugin-mongo
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2812294622738366735
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2812294622738366735
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MongoDB plugin for Fluent event collector
 test_files:
 - test/plugin/in_mongo_tail.rb

data/lib/fluent/plugin/out_mongo_backup.rb

@@ -1,28 +0,0 @@
-require 'fluent/plugin/out_copy'
-require 'fluent/plugin/out_mongo'
-
-
-module Fluent
-
-
-class MongoBackupOutput < CopyOutput
-  Fluent::Plugin.register_output('mongo_backup', self)
-
-  class MongoOutputForBackup < MongoOutput
-    config_param :database, :string, :default => 'fluent'
-    config_param :collection, :string, :default => 'out_mongo_backup'
-
-    # TODO: optimize
-  end
-
-  def configure(conf)
-    super
-
-    backup = MongoOutputForBackup.new
-    backup.configure(conf.merge({'capped' => true}))
-    @outputs.unshift(backup)
-  end
-end
-
-
-end