fluent-plugin-mysql-replicator 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f457b520cc136f8ec0b3c78ee690fa20e4ce65a9
-  data.tar.gz: 2df7a1c2c1bbf24741b6fbf9ed35b819d499eb80
+SHA256:
+  metadata.gz: 5c523ddf1d5052d11c6c7a0f7e9172d319c881257d791a0006cd1a6601f5a948
+  data.tar.gz: ca9f218dfa56543f141d8911578250194281bfbad16d8f5ed6b4980120d99c8d
 SHA512:
-  metadata.gz: b96f9134fa44ca80468a77abbbc10f30f28f8a1c12cd60a91e56f0c1a4a9e8e4768d41faa67646f57ea3b045815eb753bf6e1a89bb92c5385faf2afdc6786f11
-  data.tar.gz: '088c4f52b9565348fde62f86232b23f315b268db9e5d52bdcda7055eca2167b837336e0b18ede444657c0c0acf1c2083de245dd15c15f18e9caa529f44ebcf70'
+  metadata.gz: a5266cd4f824e781d53eaa613c37f260c7814badcee87fb6c49a1321e9c9ac8bc8d9505b2ea800f3a8ccde237b2b0eeb808e187463996c2b1aecc93065128869
+  data.tar.gz: 70834ef8629d34bbd53aa1ff9d66ba706d6df5b48cd310d8a554c7d25628682633860123f63855e851482abda385e6288c4fcd01da848cbffc56bc0525553968

data/README.md

@@ -31,13 +31,13 @@ install with gem or fluent-gem command as:
 
 `````
 # for system installed fluentd
-$ gem install fluent-plugin-mysql-replicator -v 1.0.1
+$ gem install fluent-plugin-mysql-replicator -v 1.0.2
 
 # for td-agent2
 $ sudo td-agent-gem install fluent-plugin-mysql-replicator -v 0.6.1
 
 # for td-agent3
-$ sudo td-agent-gem install fluent-plugin-mysql-replicator -v 1.0.1
+$ sudo td-agent-gem install fluent-plugin-mysql-replicator -v 1.0.2
 `````
 
 ## Included plugins

data/fluent-plugin-mysql-replicator.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-mysql-replicator"
-  s.version     = "1.0.1"
+  s.version     = "1.0.2"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-mysql-replicator"

data/lib/fluent/plugin/in_mysql_replicator_multi.rb

@@ -1,9 +1,11 @@
-require 'fluent/input'
+require 'fluent/plugin/input'
 
 module Fluent::Plugin
-  class MysqlReplicatorMultiInput < Fluent::Input
+  class MysqlReplicatorMultiInput < Fluent::Plugin::Input
     Fluent::Plugin.register_input('mysql_replicator_multi', self)
 
+    helpers :thread
+
     def initialize
       require 'mysql2'
       require 'digest/sha1'
@@ -34,6 +36,7 @@ module Fluent::Plugin
         @mutex = Mutex.new
         @manager_db = get_manager_connection
         @manager_db.query("SET SESSION wait_timeout=1800;")
+        @running = true
         @threads << thread_create(:in_mysql_replicator_flusher) {
           @hash_table_bulk_insert = []
           @hash_table_bulk_insert_last_time = Time.now
@@ -51,7 +54,13 @@ module Fluent::Plugin
       end
     end
 
+    def stop
+      @running = false
+      super
+    end
+
     def shutdown
+      @threads.each(&:join)
       super
     end
 
@@ -73,7 +82,7 @@ module Fluent::Plugin
         }
         primary_key = config['primary_key']
         previous_id = current_id = nil
-        loop do
+        while @running
           rows_count = 0
           start_time = Time.now
           unless config['prepared_query'].nil?
@@ -214,7 +223,7 @@ module Fluent::Plugin
 
     def hash_table_flusher
       begin
-        loop do
+        while @running
           if @hash_table_bulk_insert.empty? || @bulk_insert_timeout > (Time.now - @hash_table_bulk_insert_last_time)
             sleep @bulk_insert_timeout
             next
@@ -223,6 +232,9 @@ module Fluent::Plugin
             flush_hash_table
           }
         end
+        @mutex.synchronize {
+          flush_hash_table
+        }
       rescue StandardError => e
         @mutex.synchronize {
           log.error "mysql_replicator_multi: failed to flush buffered query. :config=>#{masked_config}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-replicator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kentaro Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,11 +149,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Fluentd input plugin to track insert/update/delete event from MySQL database
   server. Not only that, it could multiple table replication and generate nested document
   for Elasticsearch/Solr. It's comming support replicate to another RDB/noSQL.
-test_files: []
+test_files:
+- test/helper.rb
+- test/plugin/test_in_mysql_replicator.rb
+- test/plugin/test_in_mysql_replicator_multi.rb
+- test/plugin/test_out_mysql_replicator_elasticsearch.rb
+- test/plugin/test_out_mysql_replicator_solr.rb