fluent-plugin-mongo 0.6.11 → 0.6.12

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.6.12 - 2012/12/28
+
+	* Fix mongo 2.2 capped? problem in mongo_tail
+	* Add wait_time config to mongo_tail
+
+
 Release 0.6.11 - 2012/12/04
 
 	* Use buildInfo instead of serverStatus to check version

data/README.rdoc

@@ -133,6 +133,9 @@ Use _mongo_tail_ type in source.
 
       tag app.mongo_log
 
+      # waiting time when there is no next document. default is 1s.
+      wait_time 5
+
       # Convert 'time'(BSON's time) to fluent time(Unix time).
       time_key time
 

data/VERSION

@@ -1 +1 @@
-0.6.11
+0.6.12

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -11,6 +11,7 @@ class MongoTailInput < Input
   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
@@ -69,7 +70,7 @@ class MongoTailInput < Input
       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?
+      raise ConfigError, "'#{@database}.#{@collection}' is not capped: node = #{@host}:#{@port}" unless [1, true].include?(collection.stats['capped']) # older version(2.0.x or earlier) returns 1
       collection
     rescue Mongo::ConnectionFailure => e
       $log.fatal "Failed to connect to 'mongod'. Please restart 'fluentd' after 'mongod' started: #{e}"
@@ -105,7 +106,7 @@ class MongoTailInput < Input
         # Should use MultiEventStream?
         Engine.emit(tag, time, doc)
       else
-        sleep 1
+        sleep @wait_time
       end
     }
   rescue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -134,18 +134,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -452154936217966637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -452154936217966637
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23