fluent-plugin-mongo 0.6.5 → 0.6.6

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/fluent-plugin-mongo.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency "fluentd", ">= 0.10.7"
-  gem.add_dependency "mongo", [">= 1.5.2", "<= 1.5.2"]
+  gem.add_dependency "mongo", ">= 1.6.0"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "simplecov", ">= 0.5.4"
   gem.add_development_dependency "rr", ">= 1.0.0"

data/lib/fluent/plugin/out_mongo.rb

@@ -31,7 +31,6 @@ class MongoOutput < BufferedOutput
     super
     require 'mongo'
     require 'msgpack'
-    require 'fluent/plugin/mongo_ext'
 
     @clients = {}
     @connection_options = {}
@@ -56,12 +55,6 @@ class MongoOutput < BufferedOutput
       @collection_options[:max] = Config.size_value(conf['capped_max']) if conf.has_key?('capped_max')
     end
 
-    if @buffer.respond_to?(:buffer_chunk_limit)
-      @buffer.buffer_chunk_limit = available_buffer_chunk_limit
-    else
-      $log.warn "#{Fluent::VERSION} does not have :buffer_chunk_limit. Be careful when insert large documents to MongoDB"
-    end
-
     @connection_options[:safe] = @safe
 
     # MongoDB uses BSON's Date for time.
@@ -73,6 +66,13 @@ class MongoOutput < BufferedOutput
   end
 
   def start
+    # From configure for avoding complex method dependency...
+    if @buffer.respond_to?(:buffer_chunk_limit)
+      @buffer.buffer_chunk_limit = available_buffer_chunk_limit
+    else
+      $log.warn "#{Fluent::VERSION} does not have :buffer_chunk_limit. Be careful when insert large documents to MongoDB"
+    end
+
     super
   end
 

data/lib/fluent/plugin/out_mongo_replset.rb

@@ -46,14 +46,11 @@ class MongoOutputReplset < MongoOutput
   end
 
   def parse_nodes(nodes)
-    nodes.split(',').map { |node|
-      host, port = node.split(':')
-      [host, Integer(port)]
-    }
+    nodes.split(',')
   end
 
   def get_connection
-    db = Mongo::ReplSetConnection.new(*@nodes, @connection_options).db(@database)
+    db = Mongo::ReplSetConnection.new(@nodes, @connection_options).db(@database)
     authenticate(db)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000Z
+date: 2012-03-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2157236460 !ruby/object:Gem::Requirement
+  requirement: &2152542640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,24 +21,21 @@ dependencies:
         version: 0.10.7
   type: :runtime
   prerelease: false
-  version_requirements: *2157236460
+  version_requirements: *2152542640
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2157234540 !ruby/object:Gem::Requirement
+  requirement: &2152542020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
-    - - <=
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157234540
+  version_requirements: *2152542020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157233300 !ruby/object:Gem::Requirement
+  requirement: &2152541400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2157233300
+  version_requirements: *2152541400
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2157232100 !ruby/object:Gem::Requirement
+  requirement: &2152540780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +54,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *2157232100
+  version_requirements: *2152540780
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2157230740 !ruby/object:Gem::Requirement
+  requirement: &2152539800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +65,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157230740
+  version_requirements: *2152539800
 description: MongoDB plugin for Fluent event collector
 email: repeatedly@gmail.com
 executables:
@@ -87,7 +84,6 @@ files:
 - bin/mongo-tail
 - fluent-plugin-mongo.gemspec
 - lib/fluent/plugin/in_mongo_tail.rb
-- lib/fluent/plugin/mongo_ext.rb
 - lib/fluent/plugin/mongo_util.rb
 - lib/fluent/plugin/out_mongo.rb
 - lib/fluent/plugin/out_mongo_backup.rb
@@ -111,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3778596906539769149
+      hash: -1733988723759885390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3778596906539769149
+      hash: -1733988723759885390
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/lib/fluent/plugin/mongo_ext.rb

@@ -1,55 +0,0 @@
-require 'mongo'
-
-module Mongo
-  class Collection
-    # Temporary fix.
-    # See pull request 82: https://github.com/mongodb/mongo-ruby-driver/pull/82
-    def insert_documents(documents, collection_name=@name, check_keys=true, safe=false, flags={})
-      if flags[:continue_on_error]
-        message = BSON::ByteBuffer.new
-        message.put_int(1)
-      else
-        message = BSON::ByteBuffer.new("\0\0\0\0")
-      end
-
-      collect_on_error = !!flags[:collect_on_error]
-      error_docs = [] if collect_on_error
-
-      BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
-      documents =
-        if collect_on_error
-          documents.select do |doc|
-            begin
-              message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
-              true
-            rescue StandardError => e  # StandardError will be replaced with BSONError
-              doc.delete(:_id)
-              error_docs << doc
-              false
-            end
-          end
-        else
-          documents.each do |doc|
-            message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
-          end
-        end
-      raise InvalidOperation, "Exceded maximum insert size of 16,000,000 bytes" if message.size > 16_000_000
-
-      instrument(:insert, :database => @db.name, :collection => collection_name, :documents => documents) do
-        if safe
-          @connection.send_message_with_safe_check(Mongo::Constants::OP_INSERT, message, @db.name, nil, safe)
-        else
-          @connection.send_message(Mongo::Constants::OP_INSERT, message)
-        end
-      end
-
-      doc_ids = documents.collect { |o| o[:_id] || o['_id'] }
-      if collect_on_error
-        return doc_ids, error_docs
-      else
-        doc_ids
-      end
-    end
-  end
-end
-