fluent-plugin-mysql-appender 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7488c0d9b22f82b9eb343cb6acffae2a212e1d8
-  data.tar.gz: d12b6b3f933e3fbd01517dae77ca23673831ead7
+  metadata.gz: 52f77ca494835a1c58067843c2f4fe8a86335dab
+  data.tar.gz: a83ed3ed13e719326ed0e78f312fd32787e8de5a
 SHA512:
-  metadata.gz: 17b9f44b25dac7c618350343dbd48830d4cad049a5d8d14bf3522cb6ff701be71f07543e371c71ecdf1fab65b9e9105d9bce25d617e632b577d98321d0ab7113
-  data.tar.gz: a45bedf3ed659449b0a53c1aa1bc74f5fccab9b9e8a9cac928a194c7b09a25fddf82495ff743f3bd69bb1405d7cbd57bfdafe6155d38efc46b121ceb6af2336d
+  metadata.gz: cf9ef3d4bb176d5d33c53cf9faa47b1edd13c9ca0b67f685e03dc640ff214d5d29efdbb4bd4f189fdbdd185b78df8e8314fdcdee1b65d8b78ef10903048b4971
+  data.tar.gz: 1835caa09b49109b27642e0983c649133aa49b92232ecbd69099d57563b8fa505eaba2ddfcf0f1a05e8c610cfc47773b455f81b95f49d308e2ee8e5d04a1ae34

data/fluent-plugin-mysql-appender.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-mysql-appender"
-  spec.version       = "0.2.3"
+  spec.version       = "0.2.4"
   spec.authors       = ["TERASAKI Tsuyoshi"]
   spec.email         = ["tsuyoshi_terasaki@realworld.jp"]
 

data/lib/fluent/plugin/in_mysql_appender_multi.rb

@@ -36,6 +36,7 @@ module Fluent
     def start
       begin
         @threads = []
+        @mutex = Mutex.new
         YAML.load_file(@yaml_path).each do |config|
           @threads << Thread.new {
             poll(config)
@@ -56,12 +57,12 @@ module Fluent
 
     def poll(config)
       begin
-        masked_config = Hash[config.map {|k,v| (k == 'password') ? [k, v.to_s.gsub(/./, '*')] : [k,v]}]
-        $log.info "mysql_replicator_multi: polling start. :config=>#{masked_config}"
+        @mutex.synchronize {
+          $log.info "mysql_replicator_multi: polling start. :tag=>#{format_tag(config)}"
+        }
         con = get_connection()
         last_id = config['last_id']
         loop do
-          $log.info "loop start in #{format_tag(config)}."
           rows_count = 0
           start_time = Time.now
           rows, con = query(get_query(config, last_id), con)
@@ -85,13 +86,17 @@ module Fluent
           end
           con.close
           elapsed_time = sprintf("%0.02f", Time.now - start_time)
-          $log.info "mysql_appender_multi: finished execution :tag=>#{tag} :rows_count=>#{rows_count} :last_id=>#{last_id} :elapsed_time=>#{elapsed_time} sec"
+          @mutex.synchronize {
+            $log.info "mysql_appender_multi: finished execution :tag=>#{tag} :rows_count=>#{rows_count} :last_id=>#{last_id} :elapsed_time=>#{elapsed_time} sec"
+          }
           sleep @interval
         end
       rescue StandardError => e
-        $log.error "mysql_appender_multi: failed to execute query. :config=>#{masked_config}"
-        $log.error "error: #{e.message}"
-        $log.error e.backtrace.join("\n")
+        @mutex.synchronize {
+          $log.error "mysql_appender_multi: failed to execute query. :config=>#{masked_config}"
+          $log.error "error: #{e.message}"
+          $log.error e.backtrace.join("\n")
+        }
       end
     end
 
@@ -112,7 +117,8 @@ module Fluent
     end
 
     def format_tag(config)
-      "#{tag}.#{config['database']}.#{config['table_name']}"
+      add_db = config['td_database'] ? config['td_database'] + '.' : ''
+      "#{tag}.#{add_db}#{config['table_name']}"
     end
 
     def get_connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-appender
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - TERASAKI Tsuyoshi