fluent-plugin-mysql-replicator 0.2.1 → 0.2.2

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     = "0.2.1"
+  s.version     = "0.2.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.rb

@@ -59,7 +59,11 @@ module Fluent
         query(@query).each do |row|
           current_ids << row[@primary_key]
           current_hash = Digest::SHA1.hexdigest(row.flatten.join)
-          row.each {|k, v| row[k] = v.to_s if v.is_a? Time}
+          row.each {|k, v| row[k] = v.to_s if v.is_a?(Time) || v.is_a?(Date)}
+          if row[@primary_key].nil?
+            $log.error "mysql_replicator: missing primary_key. :tag=>#{tag} :primary_key=>#{primary_key}"
+            break
+          end
           if !table_hash.include?(row[@primary_key])
             tag = format_tag(@tag, {:event => :insert})
             emit_record(tag, row)
@@ -84,7 +88,7 @@ module Fluent
             end
           end
         end
-        elapsed_time = sprintf("%0.02f", (Time.now - start_time) % 60)
+        elapsed_time = sprintf("%0.02f", Time.now - start_time)
         $log.info "mysql_replicator: finished execution :tag=>#{tag} :elapsed_time=>#{elapsed_time} seconds"
         sleep @interval
       end
@@ -97,7 +101,7 @@ module Fluent
     def format_tag(tag, param)
       pattern = {'${event}' => param[:event].to_s, '${primary_key}' => @primary_key}
       tag.gsub(/\${[a-z_]+(\[[0-9]+\])?}/, pattern) do
-        $log.warn "mysql_replicator: missing placeholder. tag:#{tag} placeholder:#{$1}" unless pattern.include?($1)
+        $log.warn "mysql_replicator: missing placeholder. :tag=>#{tag} :placeholder=>#{$1}" unless pattern.include?($1)
         pattern[$1]
       end
     end

data/lib/fluent/plugin/in_mysql_replicator_multi.rb

@@ -69,15 +69,20 @@ module Fluent
           db = get_origin_connection(config)
           db.query(config['query']).each do |row|
             @mutex.lock
-            row.each {|k, v| row[k] = v.to_s if v.is_a? Time}
+            row.each {|k, v| row[k] = v.to_s if v.is_a?(Time) || v.is_a?(Date)}
             current_id = row[primary_key]
+            if row[primary_key].nil?
+              $log.error "mysql_replicator_multi: missing primary_key. :setting_name=>#{config['name']} :primary_key=>#{primary_key}"
+              @mutex.unlock
+              break
+            end
             detect_insert_update(config, row)
             detect_delete(config, current_id, previous_id)
             previous_id = current_id
             @mutex.unlock
           end
           db.close
-          elapsed_time = sprintf("%0.02f", (Time.now - start_time) % 60)
+          elapsed_time = sprintf("%0.02f", Time.now - start_time)
           $log.info "mysql_replicator_multi: finished execution :setting_name=>#{config['name']} :elapsed_time=>#{elapsed_time} seconds"
           sleep config['interval']
         end
@@ -170,7 +175,7 @@ module Fluent
     def format_tag(tag, param)
       pattern = {'${name}' => param[:name], '${event}' => param[:event].to_s, '${primary_key}' => param[:primary_key]}
       tag.gsub(/\${[a-z_]+(\[[0-9]+\])?}/, pattern) do
-        $log.warn "mysql_replicator_multi: missing placeholder. tag:#{tag} placeholder:#{$1}" unless pattern.include?($1)
+        $log.warn "mysql_replicator_multi: missing placeholder. :tag=>#{tag} :placeholder=>#{$1}" unless pattern.include?($1)
         pattern[$1]
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-replicator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: