fluent-plugin-mysql-appender 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f01fba2e7839e587695ca683f10af45bb0c27c
-  data.tar.gz: 5eb8a58ab97d30ff26f4df88d0aeecb975134389
+  metadata.gz: c019cd62a986d24066118816d73c07bc47d767d2
+  data.tar.gz: 2bd589f13b322685e6b4b29a1c7fcea50ad6be3a
 SHA512:
-  metadata.gz: d8b5697f237ba9fbd22b3d40e4d5eba602e6428c6f7d5be383d88bbd48a7b96c88f47210d4e7dc89ddffc17b449fbc2eaa241c25002dab3b3bd5cc3961c889e4
-  data.tar.gz: 9eb907dc34760b0d12068d43bb9e855a9539741f28154fe9f179510822228593cccc0e9ea8ea21b88fe3ebb5dde7fc8e74ff5417cf74755f4181f4dfae371242
+  metadata.gz: d118c38a6a772f5968af1ab3e98e122ad3997847d02762e506d864c695448569903c031ba4c200df37eb5ca75dc9cc1b40de57dd5a7098445f54d7e54ac7c974
+  data.tar.gz: 497d35ab4ebcd2d5fd866cba96a378cd1508ef15e02eaffe284e4b26945a4f7d4803efe3f943ba8444ffdf6be153f818fdec5bf4f97f0b22342bd2dad471653b

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.4.7"
+  spec.version       = "0.4.8"
   spec.authors       = ["TERASAKI Tsuyoshi"]
   spec.email         = ["tsuyoshi_terasaki@realworld.jp"]
 

data/lib/fluent/plugin/in_mysql_appender_multi.rb

@@ -65,21 +65,19 @@ module Fluent
           configs.each do |config|
             rows_count = 0
             db.query(get_query(config)).each do |row|
-              if !config['entry_time'].nil? then
-                entry_time = get_time(row[config['entry_time']])
-                if (start_time - config['delay']) < entry_time then
-                  break
+              entry_time = get_time(row[config['entry_time']])
+              if (start_time - config['delay']) > entry_time then
+                if config['time_column'].nil? then
+                    td_time = Engine.now
+                else
+                  td_time = get_time(row[config['time_column']]).to_i
                 end
+                row.each {|k, v| row[k] = v.to_s if v.is_a?(Time) || v.is_a?(Date) || v.is_a?(BigDecimal)}
+                # puts row
+                router.emit(config['tag'], td_time, row)
+                rows_count += 1
+                config['last_id'] = row[config['primary_key']]
               end
-              if config['time_column'].nil? then
-                  td_time = Engine.now
-              else
-                td_time = get_time(row[config['time_column']]).to_i
-              end
-              row.each {|k, v| row[k] = v.to_s if v.is_a?(Time) || v.is_a?(Date) || v.is_a?(BigDecimal)}
-              router.emit(config['tag'], td_time, row)
-              rows_count += 1
-              config['last_id'] = row[config['primary_key']]
             end
             $log.info "mysql_appender_multi: finished execution :tag=>#{config['tag']} :rows_count=>#{rows_count} :last_id=>#{config['last_id']}"
           end

data/test/plugin/test_in_mysql_appender_multi.rb

@@ -38,7 +38,7 @@ class MysqlAppenderMultiInputTest < Test::Unit::TestCase
     - created_at
   last_id: -1
   entry_time: created_at
-  delay: 3h
+  delay: 5m
   td_database: sample_datasets
 - table_name: test_tbl2
   primary_key: id
@@ -51,7 +51,7 @@ class MysqlAppenderMultiInputTest < Test::Unit::TestCase
     - created_at
   last_id: -1
   entry_time: created_at
-  delay: 3h
+  delay: 5m
   td_database: sample_datasets
 EOS
     conf = YAML.load(str)

metadata

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