fluent-plugin-rds-log 0.1.4 → 0.1.5

data/fluent-plugin-rds-log.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rds-log"
-  gem.version       = "0.1.4"
+  gem.version       = "0.1.5"
   gem.authors       = ["shinsaka"]
   gem.email         = ["shinx1265@gmail.com"]
   gem.description   = "Amazon RDS slow_log and general_log input plugin for Fluent event collector"

data/lib/fluent/plugin/in_rds_log.rb

@@ -35,16 +35,9 @@ class Fluent::Rds_LogInput < Fluent::Input
   end
 
   private
-  def connect_all
-    @clients = {}
-    @host.split(',').each do |host|
-      @clients[host] = connect(host)
-    end
-  end
 
   def connect(host)
     begin
-      $log.info "fluent-plugin-rds-log: connecting RDS [#{host}]"
       client = Mysql2::Client.new({
         :host => host,
         :port => @port,
@@ -53,39 +46,41 @@ class Fluent::Rds_LogInput < Fluent::Input
         :reconnect => @auto_reconnect,
         :database => 'mysql'
       })
-      $log.info "fluent-plugin-rds-log: connected RDS [#{host}]"
       return client
     rescue
       $log.error "fluent-plugin-rds-log: cannot connect RDS [#{host}]"
     end
+    return nil
   end
 
   def watch
-    connect_all
     while true
-      sleep @refresh_interval
       @host.split(',').each do |host|
         output(host)
       end
+      sleep @refresh_interval
     end
   end
 
   def output(host)
-    client = @clients[host]
-    if client.nil?
-      client = connect(host)
-      if client.nil?
-        return
-      end
-    end
-
-    client.query("CALL mysql.rds_rotate_#{@log_type}")
-
-    output_log_data = client.query("SELECT * FROM mysql.#{@log_type}_backup", :cast => false)
+    client = connect(host)
+    return if client.nil?
+    output_log_data = query(client)
     output_log_data.each do |row|
       row.delete_if{|key,value| value == ''}
       row['host'] = host if @add_host
       Fluent::Engine.emit(tag, Fluent::Engine.now, row)
     end
+    client.close
+  end
+
+  def query(client)
+    begin
+      client.query("CALL mysql.rds_rotate_#{@log_type}")
+      output_log_data = client.query("SELECT * FROM mysql.#{@log_type}_backup", :cast => false)
+    rescue Exception => e
+      $log.error "fluent-plugin-rds-log: ERROR Occurred!"
+      $log.error "#{e.message}\n#{e.backtrace.join("\n")}"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-log
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd