fluent-plugin-rds-slowlog 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db90bf646e818655b609cd6ce8f33f8995596dfa
-  data.tar.gz: 16113ed4766d26efcfbf5478bba553d914af5338
+  metadata.gz: d17493f129606e4f84d2253aed3fcbbbac3bf7a9
+  data.tar.gz: e42ff200088f9f5019820a2c9c821a65fc17d9a3
 SHA512:
-  metadata.gz: ca01b38aaa6d05181f8394f78071beff0b34a973c666b397d183cdb25e643aca4112d586f31d912613f160d0cefcbf076ff0ae55ba9f51582b6a333ba7e9c025
-  data.tar.gz: 326da4ace80776fd2f80f1729fa6f351e952014a72967bc8f6b2e2e3cc7216ff1293fb483c4f3eb6683f5f27fb8573b3b5823fa5d3688ebbd1b7f52675108f0e
+  metadata.gz: 79cf922239edf1f7c2d2fc6e17d8f93d6632b722928439d1d26f17477ac59384b9f7a8996a8693db2ee9c017943536a42754ea52b22f318e9c81bf6b994954a2
+  data.tar.gz: 854d1a7216fbd15096363fe583278a6f8c2ff4e8c13ccfb4443c09b1ba6241045eaa38408ac5bb7003febc7215a11eba8ad7d02146b11a0529e867f3bd9a437b

data/.travis.yml

@@ -8,3 +8,4 @@ rvm:
   - 2.2
 
 script: bundle exec rake test
+before_install: gem update bundler

data/fluent-plugin-rds-slowlog.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-rds-slowlog"
-  gem.version       = "0.0.7"
+  gem.version       = "0.0.8"
   gem.authors       = ["kenjiskywalker", "winebarrel"]
   gem.email         = ["git@kenjiskywalker.org", "sgwr_dts@yahoo.co.jp"]
   gem.description   = "Amazon RDS slow_log input plugin for Fluent event collector"
@@ -15,14 +15,25 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  if RUBY_VERSION >= '1.9.3'
+  if RUBY_VERSION > '2.0.0'
     gem.add_dependency "fluentd"
+  elsif RUBY_VERSION > '1.9.2'
+    gem.add_dependency "fluentd", "~> 0.12.29"
   else
     gem.add_dependency "fluentd", "<= 0.10.55"
   end
 
+  if RUBY_VERSION <= '2.0.0'
+    gem.add_dependency "json", "< 2"
+  end
+
+  if RUBY_VERSION <= '1.9.2'
+    gem.add_development_dependency "rake", "<= 11"
+  else
+    gem.add_development_dependency "rake", ">= 10.0.4"
+  end
+
   gem.add_dependency "mysql2",  "~> 0.3.11"
-  gem.add_development_dependency "rake", ">= 10.0.4"
   gem.add_development_dependency "test-unit", "~> 3.1.3"
   gem.add_development_dependency "timecop"
 end

data/lib/fluent/plugin/in_rds_slowlog.rb

@@ -1,3 +1,5 @@
+require 'fluent/input'
+
 class Fluent::Rds_SlowlogInput < Fluent::Input
   Fluent::Plugin.register_input("rds_slowlog", self)
 
@@ -27,13 +29,7 @@ class Fluent::Rds_SlowlogInput < Fluent::Input
   def configure(conf)
     super
     begin
-      @client = Mysql2::Client.new({
-        :host => @host,
-        :port => @port,
-        :username => @username,
-        :password => @password,
-        :database => 'mysql'
-      })
+      @client = create_mysql_client
     rescue
       log.error "fluent-plugin-rds-slowlog: cannot connect RDS"
     end
@@ -79,6 +75,24 @@ class Fluent::Rds_SlowlogInput < Fluent::Input
     if @backup_table
       @client.query("INSERT INTO #{@backup_table} SELECT * FROM slow_log_backup")
     end
+  rescue Mysql2::Error => e
+    @log.error(e.message)
+    @log.error_backtrace(e.backtrace)
+
+    unless @client.ping
+      @log.info('fluent-plugin-rds-slowlog: try to reconnect to RDS')
+      @client = create_mysql_client
+    end
+  end
+
+  def create_mysql_client
+    Mysql2::Client.new({
+      :host => @host,
+      :port => @port,
+      :username => @username,
+      :password => @password,
+      :database => 'mysql'
+    })
   end
 
   class TimerWatcher < Coolio::TimerWatcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-slowlog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - kenjiskywalker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -26,33 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
-  type: :runtime
+        version: 10.0.4
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 10.0.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
-  type: :development
+        version: 0.3.11
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Amazon RDS slow_log input plugin for Fluent event collector