fluent-plugin-mysql-appender 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59ae44ef84e82ac89dbb9e5f142c01306766c1e
-  data.tar.gz: 12c2ff32cc17a34ddb3e707f0924c948acdeba43
+  metadata.gz: cddd9b64fe9bf5246e9358a2be7c55152becad83
+  data.tar.gz: 454a56ecdadb14a759ca0e93fb563079a46ab240
 SHA512:
-  metadata.gz: 9c443c230fa009dfca794d9a20f3f199e185668639b101de2a3e17481e43cffd05d80dcde4fdf304310ef59e93fedce05c35df1458016ba2f23ef35d28a8a090
-  data.tar.gz: 6228f2dbdb50a55f2ba2dee385b887c8e6ab98be52afff5f41cc618cb5b29642e678ea2c84d95bc5cc992a167e7fbeee5546a2f0d401ed97a0d9fbe13562858a
+  metadata.gz: 4d934cbbc3d5c1c74622b88fd966987ae9d6f5383710b25cc9fa261893abb7625b74760069accba4c37b5778685890e44128c9e86113c9dda57ec552d4f79a6d
+  data.tar.gz: bd10ab8c46493c296774244040c50f59a33429be339490d033218ceba813bf929af929382214f4fb76a7dc76536e8841ac20f278257cda5c75fea5ff77ad847f

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

data/lib/fluent/plugin/in_mysql_appender_multi.rb

@@ -72,13 +72,12 @@ module Fluent
         @mutex.synchronize {
           $log.info "mysql_appender_multi: polling start. :tag=>#{tag} :delay=>#{delay}"
         }
-        con = get_connection()
         last_id = get_lastid(config)
         loop do
           rows_count = 0
           start_time = Time.now
-          rows, con = query(get_query(config, last_id), con)
-          rows.each_with_index do |row, index|
+          db = get_connection
+          db.query(get_query(config, last_id)).each do |row|
             if !config['entry_time'].nil? then
               entry_time = get_time(row[config['entry_time']])
               if (start_time - delay) < entry_time then
@@ -95,7 +94,7 @@ module Fluent
             rows_count += 1
             last_id = row[config['primary_key']]
           end
-          con.close
+          db.close
           elapsed_time = sprintf("%0.02f", Time.now - start_time)
           @mutex.synchronize {
             $log.info "mysql_appender_multi: finished execution :tag=>#{tag} :rows_count=>#{rows_count} :last_id=>#{last_id} :elapsed_time=>#{elapsed_time} sec"
@@ -151,18 +150,6 @@ module Fluent
       "SELECT #{config['columns'].join(",")} FROM #{config['table_name']} where #{config['primary_key']} > #{last_id} order by #{config['primary_key']} asc limit #{config['limit']}"
     end
 
-    def query(query, con = nil)
-      begin
-        con = con.nil? ? get_connection : con
-        con = con.ping ? con : get_connection
-        return con.query(query), con
-      rescue Exception => e
-        $log.warn "mysql_appender_multi: #{e}"
-        sleep @interval
-        retry
-      end
-    end
-
     def format_tag(config)
       add_db = ENV.key?('TD_DATABASE') ? ENV['TD_DATABASE'] + '.' : ''
       "#{tag}.#{add_db}#{config['table_name']}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-appender
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - TERASAKI Tsuyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd