fluent-plugin-mysql-appender 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cddd9b64fe9bf5246e9358a2be7c55152becad83
-  data.tar.gz: 454a56ecdadb14a759ca0e93fb563079a46ab240
+  metadata.gz: 33b74209aa5fbce8b7345eed6b427915a1967561
+  data.tar.gz: f839052768f3823332b238dae879909e8dcc4418
 SHA512:
-  metadata.gz: 4d934cbbc3d5c1c74622b88fd966987ae9d6f5383710b25cc9fa261893abb7625b74760069accba4c37b5778685890e44128c9e86113c9dda57ec552d4f79a6d
-  data.tar.gz: bd10ab8c46493c296774244040c50f59a33429be339490d033218ceba813bf929af929382214f4fb76a7dc76536e8841ac20f278257cda5c75fea5ff77ad847f
+  metadata.gz: b3741d7c4bf1fac02311694a4910d9005f7179a99cbfde003ae69c798ab156a3c2b4a2220e0f188ea508fff357a7e51e3ba75367a043192b5076da6ef3db3191
+  data.tar.gz: cdc1ca4cea2825f7ee3f7a10561765943c327fadcf08bc6aa3babe7f26105b3221aa1a14bb3ee36ae1fc8e30a7244197cc67ab7e567bf85d948445651be7c010

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

data/lib/fluent/plugin/in_mysql_appender_multi.rb

@@ -37,68 +37,53 @@ module Fluent
       if !File.exist?(@yaml_path)
         raise Fluent::ConfigError, "mysql_appender_multi: No such file in 'yaml_path'."
       end
-
-      if @tag.nil?
-        raise Fluent::ConfigError, "mysql_appender_multi: missing 'tag' parameter. Please add following line into config like 'tag appender.${name}.${event}.${primary_key}'"
-      end
     end
 
     def start
-      begin
-        @threads = []
-        @mutex = Mutex.new
-        YAML.load_file(@yaml_path).each do |config|
-          @threads << Thread.new {
-            poll(config)
-          }
-        end
-        $log.error "mysql_appender_multi: stop working due to empty configuration" if @threads.empty?
-      rescue => e
-        $log.error "error: #{e.message}"
-        $log.error e.backtrace.join("\n")
-      end
+      @thread = Thread.new(&method(:run))
     end
 
     def shutdown
-      @threads.each do |thread|
-        Thread.kill(thread)
-      end
+      Thread.kill(@thread)
     end
 
-    def poll(config)
+    private
+
+    def run
       begin
-        tag = format_tag(config)
-        delay = Config.time_value(config['delay'] || 0)
-        @mutex.synchronize {
-          $log.info "mysql_appender_multi: polling start. :tag=>#{tag} :delay=>#{delay}"
-        }
-        last_id = get_lastid(config)
+        # initialize
+        configs = YAML.load_file(@yaml_path)
+        configs.each do |config|
+          config['last_id'] = get_lastid(config)
+          config['tag'] = format_tag(config)
+          config['delay'] = Config.time_value(config['delay'] || 0)
+        end
+
         loop do
-          rows_count = 0
-          start_time = Time.now
           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
-                break
+          configs.each do |config|
+            db.query(get_query(config)).each do |row|
+              rows_count = 0
+              if !config['entry_time'].nil? then
+                entry_time = get_time(row[config['entry_time']])
+                if (start_time - config['delay']) < entry_time then
+                  break
+                end
               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']]
+              $log.info "mysql_appender_multi: :tag=>#{config['tag']} :rows_count=>#{rows_count} :last_id=>#{config['last_id']} "
             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(tag, td_time, row)
-            rows_count += 1
-            last_id = row[config['primary_key']]
           end
           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"
-          }
+          $log.info "mysql_appender_multi: finished execution :elapsed_time=>#{elapsed_time} sec"
           sleep @interval
         end
       rescue => e
@@ -146,8 +131,8 @@ module Fluent
       end
     end
 
-    def get_query(config, last_id)
-      "SELECT #{config['columns'].join(",")} FROM #{config['table_name']} where #{config['primary_key']} > #{last_id} order by #{config['primary_key']} asc limit #{config['limit']}"
+    def get_query(config)
+      "SELECT #{config['columns'].join(",")} FROM #{config['table_name']} where #{config['primary_key']} > #{config['last_id']} order by #{config['primary_key']} asc limit #{config['limit']}"
     end
 
     def format_tag(config)

metadata

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