fluent-plugin-mysql-query 0.2.1 → 0.2.2

data/fluent-plugin-mysql-query.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-mysql-query"
-  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-query"

data/lib/fluent/plugin/in_mysql_query.rb

@@ -24,7 +24,7 @@ module Fluent
 
     def configure(conf)
       super
-      @hostname = get_mysql_hostname
+      @hostname = nil
       @interval = Config.time_value(@interval)
       @nest_result = Config.bool_value(@nest_result) || false
       @row_count = Config.bool_value(@row_count) || false
@@ -42,6 +42,7 @@ module Fluent
 
     def run
       loop do
+        @hostname = get_mysql_hostname if @hostname.nil?
         tag = "#{@tag}".gsub('__HOSTNAME__', @hostname).gsub('${hostname}', @hostname)
         record = Hash.new
         record.store('hostname', @hostname) if @record_hostname
@@ -60,15 +61,21 @@ module Fluent
     end
 
     def get_connection
-      return Mysql2::Client.new({
-        :host => @host, 
-        :port => @port,
-        :username => @username,
-        :password => @password,
-        :database => @database,
-        :encoding => @encoding,
-        :reconnect => true
-      })
+      begin
+        return Mysql2::Client.new({
+          :host => @host,
+          :port => @port,
+          :username => @username,
+          :password => @password,
+          :database => @database,
+          :encoding => @encoding,
+          :reconnect => true
+        })
+      rescue Exception => e
+        $log.warn "mysql_query: #{e}"
+        sleep @interval
+        retry
+      end
     end
 
     def query(query)
@@ -76,7 +83,9 @@ module Fluent
       begin
         return @mysql.query(query, :cast => false, :cache_rows => false)
       rescue Exception => e
-        $log.info "#{e.inspect}"
+        $log.warn "mysql_query: #{e}"
+        sleep @interval
+        retry
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-mysql-query
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-29 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &10854720 !ruby/object:Gem::Requirement
+  requirement: &22860620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10854720
+  version_requirements: *22860620
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &10846780 !ruby/object:Gem::Requirement
+  requirement: &22860160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10846780
+  version_requirements: *22860160
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &10846340 !ruby/object:Gem::Requirement
+  requirement: &22859740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10846340
+  version_requirements: *22859740
 description: 
 email:
 - y.ken.studio@gmail.com