fluent-plugin-mongo 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8bc7989f6becb39ffa820ae11bfed1c1ca4e0cc
-  data.tar.gz: 593a678c7822803ee8c1430415dd9f2d0d3df0ab
+  metadata.gz: db2edd199b7056e1a35d3b791ac6a393d7cba246
+  data.tar.gz: 13d1f6785aa437885ffb5f38cbfb85aa58e222ba
 SHA512:
-  metadata.gz: 18f24adca71b2f816d266045786aef27c6f73d6868d804c3dcdd54e770e441124c4cfd3f30bf123a66cc4475196db39df2eb6a6056a0c71789c71554af323ac3
-  data.tar.gz: fadd2695bcd18e93932b0fbdc6f0713abffd9c85af177573332e82c9599914cf0e7cad7f10f72d1fd368ebb5c5881ae8b517ee49173cfc34ac1e0e933ef0666a
+  metadata.gz: cb7afa69474f59e1c47b173ef7d34bb0b9af922731887039b9180cec9ff5aca5d90294e02dde44b2bfdc5af83f7799e99a0e59ae364570338afa2bcf7e07167f
+  data.tar.gz: 1c09da93b1179ee4dd55a5c7cefcf718e7a04309eab2049ad91bba3aec81570d2edd97cbf30962e9b066d0d58135350e9031730fc0f19fa50eae3a33a12cd1f7

data/.travis.yml

@@ -2,6 +2,7 @@ rvm:
  - 1.9.3
  - 2.0.0
  - 2.1
+ - 2.2
  - rbx
 
 before_script:

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.7.11 - 2015/11/26
+
+	* Add secret option to related parameters
+	* Support label in input plugin
+	* Add socket_pool_size parameter
+
+
 Release 0.7.10 - 2015/05/28
 
 	* Add SSL authentication options

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

data/fluent-plugin-mongo.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |gem|
   gem.description = "MongoDB plugin for Fluentd"
   gem.homepage    = "https://github.com/fluent/fluent-plugin-mongo"
   gem.summary     = gem.description
+  gem.licenses    = ["Apache-2.0"]
   gem.version     = File.read("VERSION").strip
   gem.authors     = ["Masahiro Nakagawa"]
   gem.email       = "repeatedly@gmail.com"
@@ -16,9 +17,10 @@ Gem::Specification.new do |gem|
   gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "fluentd", [">= 0.10.9", "< 2"]
+  gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
   gem.add_dependency "mongo", "~> 1.9"
   gem.add_development_dependency "rake", ">= 0.9.2"
   gem.add_development_dependency "simplecov", ">= 0.5.4"
   gem.add_development_dependency "rr", ">= 1.0.0"
+  gem.add_development_dependency "test-unit", ">= 3.0.0"
 end

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -161,7 +161,7 @@ module Fluent
       end
 
       # Should use MultiEventStream?
-      Engine.emit(tag, time, doc)
+      router.emit(tag, time, doc)
     end
 
     def cursor_conf

data/lib/fluent/plugin/mongo_util.rb

@@ -5,7 +5,7 @@ module MongoUtil
   def self.included(klass)
     klass.instance_eval {
       config_param :user, :string, :default => nil
-      config_param :password, :string, :default => nil
+      config_param :password, :string, :default => nil, :secret => true
     }
   end
 

data/lib/fluent/plugin/out_mongo.rb

@@ -20,6 +20,7 @@ module Fluent
     config_param :exclude_broken_fields, :string, :default => nil
     config_param :write_concern, :integer, :default => nil
     config_param :journaled, :bool, :default => false
+    config_param :socket_pool_size, :integer, :default => 1
     config_param :replace_dot_in_key_with, :string, :default => nil
     config_param :replace_dollar_in_key_with, :string, :default => nil
 
@@ -31,7 +32,7 @@ module Fluent
     config_param :ssl, :bool, :default => false
     config_param :ssl_cert, :string, :default => nil
     config_param :ssl_key, :string, :default => nil
-    config_param :ssl_key_pass_phrase, :string, :default => nil
+    config_param :ssl_key_pass_phrase, :string, :default => nil, :secret => true
     config_param :ssl_verify, :bool, :default => false
     config_param :ssl_ca_cert, :string, :default => nil
 
@@ -77,6 +78,7 @@ module Fluent
 
       @connection_options[:w] = @write_concern unless @write_concern.nil?
       @connection_options[:j] = @journaled
+      @connection_options[:pool_size] = @socket_pool_size
 
       @connection_options[:ssl] = @ssl
 

data/test/plugin/out_mongo.rb

@@ -52,7 +52,7 @@ class MongoOutputTest < Test::Unit::TestCase
     assert_equal('localhost', d.instance.host)
     assert_equal(@@mongod_port, d.instance.port)
     assert_equal({:capped => true, :size => 100}, d.instance.collection_options)
-    assert_equal({:ssl => false, :j => false}, d.instance.connection_options)
+    assert_equal({:ssl => false, :pool_size => 1, :j => false}, d.instance.connection_options)
     # buffer_chunk_limit moved from configure to start
     # I will move this test to correct space after BufferedOutputTestDriver supports start method invoking
     # assert_equal(Fluent::MongoOutput::LIMIT_BEFORE_v1_8, d.instance.instance_variable_get(:@buffer).buffer_chunk_limit)
@@ -63,7 +63,7 @@ class MongoOutputTest < Test::Unit::TestCase
       write_concern 2
     ])
 
-    assert_equal({:w => 2, :ssl => false, :j => false}, d.instance.connection_options)
+    assert_equal({:w => 2, :pool_size => 1, :ssl => false, :j => false}, d.instance.connection_options)
   end
 
   def test_configure_with_journaled
@@ -71,7 +71,7 @@ class MongoOutputTest < Test::Unit::TestCase
       journaled true
     ])
 
-    assert_equal({:ssl => false, :j => true}, d.instance.connection_options)
+    assert_equal({:ssl => false, :pool_size => 1, :j => true}, d.instance.connection_options)
   end
 
   def test_configure_with_ssl
@@ -79,7 +79,7 @@ class MongoOutputTest < Test::Unit::TestCase
       ssl true
     ])
 
-    assert_equal({:ssl => true, :j => false, :ssl_cert=>nil, :ssl_key=>nil, :ssl_key_pass_phrase=>nil, :ssl_verify=>false, :ssl_ca_cert=>nil}, d.instance.connection_options)
+    assert_equal({:ssl => true, :pool_size => 1, :j => false, :ssl_cert=>nil, :ssl_key=>nil, :ssl_key_pass_phrase=>nil, :ssl_verify=>false, :ssl_ca_cert=>nil}, d.instance.connection_options)
   end
 
   def test_format
@@ -273,7 +273,7 @@ class MongoReplOutputTest < MongoOutputTest
     assert_equal(build_seeds(3), d.instance.nodes)
     assert_equal(45, d.instance.num_retries)
     assert_equal({:capped => true, :size => 100}, d.instance.collection_options)
-    assert_equal({:ssl => false, :j => false}, d.instance.connection_options)
+    assert_equal({:ssl => false, :pool_size => 1, :j => false}, d.instance.connection_options)
   end
 end
 

data/test/plugin/out_mongo_tag_mapped.rb

@@ -50,7 +50,7 @@ class MongoTagCollectionTest < Test::Unit::TestCase
   end
 
   def test_write
-    skip('BufferedOutputTestDriver should support emit arguments(chain and key)')
+    omit('BufferedOutputTestDriver should support emit arguments(chain and key)')
 
     d = create_driver(CONFIG)
     d.tag = 'mytag'

data/test/test_helper.rb

@@ -3,9 +3,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rr'
 require 'test/unit'
-class Test::Unit::TestCase
-  include RR::Adapters::TestUnit
-end
 
 if ENV['SIMPLE_COV']
   require 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.10.58
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.10.58
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: MongoDB plugin for Fluentd
 email: repeatedly@gmail.com
 executables:
@@ -116,7 +130,8 @@ files:
 - test/tools/repl_set_manager.rb
 - test/tools/rs_test_helper.rb
 homepage: https://github.com/fluent/fluent-plugin-mongo
-licenses: []
+licenses:
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -134,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: MongoDB plugin for Fluentd