fluent-plugin-mongo 0.6.9 → 0.6.10

data/ChangeLog

@@ -1,3 +1,10 @@
+Release 0.6.10 - 2012/10/17
+
+	* mongo-tail always flush STDOUT for pipeline usage.
+	  https://github.com/fluent/fluent-plugin-mongo/issues/16
+	* Fix capped collection checking for 2.1.x or later versions.
+
+
 Release 0.6.9 - 2012/10/12
 
 	* Fix invalid use of '~>' in gemspec.

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/bin/mongo-tail

@@ -32,7 +32,7 @@ def get_capped_collection(conf)
   db = Mongo::Connection.new(conf[:h], conf[:p]).db(conf[:d])
   if db.collection_names.include?(conf[:c])
     collection = db.collection(conf[:c])
-    if collection.capped?
+    if [1, true].include?(collection.stats['capped']) # older version(2.0.x or earlier) returns 1 
       collection
     else
       puts "#{conf[:c]} is not capped. mongo-tail can not tail normal collection."
@@ -65,7 +65,8 @@ def tail_forever(collection, conf)
     cursor = Mongo::Cursor.new(collection, cursor_conf) unless cursor.alive?
 
     if doc = cursor.next_document
-      puts doc.to_json
+      STDOUT.puts doc.to_json
+      STDOUT.flush
     else
       sleep 1
     end

data/lib/fluent/plugin/out_mongo.rb

@@ -71,6 +71,9 @@ class MongoOutput < BufferedOutput
   end
 
   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...
     if @buffer.respond_to?(:buffer_chunk_limit)
       @buffer.buffer_chunk_limit = available_buffer_chunk_limit
@@ -166,8 +169,11 @@ class MongoOutput < BufferedOutput
     if @db.collection_names.include?(collection_name)
       collection = @db.collection(collection_name)
       unless @disable_collection_check
-        unless @collection_options[:capped] == collection.capped? # TODO: Verify capped configuration
-          raise ConfigError, "New configuration is different from existing collection"
+        capped = [1, true].include?(collection.stats['capped']) # TODO: Remove this check after mongo gem upgrade to 1.7.x
+        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
@@ -177,6 +183,10 @@ class MongoOutput < BufferedOutput
     @clients[collection_name] = collection
   end
 
+  def format_collection_mode(mode)
+    mode ? 'capped' : 'normal'
+  end
+
   def get_connection
     db = Mongo::Connection.new(@host, @port, @connection_options).db(@database)
     authenticate(db)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718527282239700478
+      hash: 2791894013534395416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2718527282239700478
+      hash: 2791894013534395416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23