fluent-plugin-mongo 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119b5490b51050d354eebb300b2f70caddd469dd
-  data.tar.gz: 0a6e35ed0fefd3babe866e1deb4c5cff102ac3c3
+  metadata.gz: e1b44afa9a00bcc44e988c6ff186cef45226f59c
+  data.tar.gz: 72818ef49d77f1eb77c58a421a528a53142302fe
 SHA512:
-  metadata.gz: f5bcf318f62c42637c223fcb4411f46429b836d724ab6128c6e3970751d0c444db988ef64647e5695c20397ed1253eefca1b7488d7c7b2530530b2ef747c6312
-  data.tar.gz: badeea8a1111a1b5406ee26ab9c78814b6beac8ceff0304fd203b2222775bef45f9f7e18ecfa56e2b7d03d45a1d554ee7b9ed5ea1320ac445be17b764812e13d
+  metadata.gz: f41c96c14b596e8bb394f5e94045f84272f104c2d8848f4f761c265c3c33ee69803638af0b7ada30a604574817bbca813f4326edad15f5607c16287cc23efc51
+  data.tar.gz: 6b31e68117d8ea3a5465ac02804c6e8a1d71f42cdb4b855c520eff1b9273a967acf3b12661113b93a265963ad1bfd4121cf7d6573a7894a71129bcddb7736bf4

data/ChangeLog

@@ -1,3 +1,8 @@
+Release 0.7.7 - 2015/03/19
+
+	* Fix in_mongo_tail shutdown mechanizm for handling stop sequence correctly.
+
+
 Release 0.7.6 - 2015/02/12
 
 	* Relax fluentd dependency to support v0.12 or later

data/VERSION

@@ -1 +1 @@
-0.7.6
+0.7.7

data/lib/fluent/plugin/in_mongo_tail.rb

@@ -60,6 +60,7 @@ module Fluent
         @file.close
       end
 
+      @stop = true
       @thread.join
       @client.db.connection.close
       super
@@ -67,7 +68,21 @@ module Fluent
 
     def run
       loop {
-        tailoop(Mongo::Cursor.new(@client, cursor_conf))
+        cursor = Mongo::Cursor.new(@client, cursor_conf)
+        begin
+          loop {
+            return if @stop
+            
+            cursor = Mongo::Cursor.new(@client, cursor_conf) unless cursor.alive?
+            if doc = cursor.next_document
+              process_document(doc)
+            else
+              sleep @wait_time
+            end
+          }
+        rescue
+          # ignore Mongo::OperationFailuer at CURSOR_NOT_FOUND
+        end
       }
     end
 
@@ -89,36 +104,27 @@ module Fluent
       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)
-        else
-          sleep @wait_time
-        end
-      }
-    rescue
-      # ignore Mongo::OperationFailuer at CURSOR_NOT_FOUND
+    def process_document(doc)
+      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)
     end
 
     def cursor_conf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mongo
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Masahiro Nakagawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd