fluent-plugin-rds-log 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae0b5159f8263fed6c4de9ebda11fb1480851190
+  data.tar.gz: 5a4ecb65deda98efbac1043f0d74f3556101710c
+SHA512:
+  metadata.gz: b46ee6015e8e0345751ad8285aa716ad017d5fa0b0a46f8a263ffa7164746855f8bfad6fdd24dc66df4664238b6aff5ac1b6489dc107f7e171b95b97d99fcfb8
+  data.tar.gz: 3c953bf450234fa749f67028088ac79bce88b8082a2a4d98ece4988392f1ae9ff66394725cc664254e47e74d4b4e4ee189a7f29712d795dbd510cd9a2ba9fc81

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.5"
+  gem.version       = "0.1.6"
   gem.authors       = ["shinsaka"]
   gem.email         = ["shinx1265@gmail.com"]
   gem.description   = "Amazon RDS slow_log and general_log input plugin for Fluent event collector"
@@ -14,7 +14,8 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency "fluentd", "~> 0.10.30"
+  gem.add_dependency "fluentd", [">= 0.10.30", "< 2"]
   gem.add_dependency "mysql2",  "~> 0.3.11"
   gem.add_development_dependency "rake", ">= 10.0.4"
+  gem.add_development_dependency "test-unit", ">= 3.1.0"
 end

data/lib/fluent/plugin/in_rds_log.rb

@@ -1,11 +1,16 @@
 class Fluent::Rds_LogInput < Fluent::Input
   Fluent::Plugin.register_input("rds_log", self)
 
+  # Define `router` method to support v0.10.57 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   config_param :tag,      :string
   config_param :host,     :string,  :default => nil
   config_param :port,     :integer, :default => 3306
   config_param :username, :string,  :default => nil
-  config_param :password, :string,  :default => nil
+  config_param :password, :string,  :default => nil, :secret => true
   config_param :log_type, :string,  :default => nil
   config_param :refresh_interval, :integer, :default => 30
   config_param :auto_reconnect, :bool, :default => true
@@ -18,7 +23,7 @@ class Fluent::Rds_LogInput < Fluent::Input
 
   def configure(conf)
     super
-    if @log_type.empty?
+    if @log_type.nil?
       $log.error "fluent-plugin-rds-log: missing parameter log_type is {slow_log|general_log}"
     end
   end
@@ -69,7 +74,7 @@ class Fluent::Rds_LogInput < Fluent::Input
     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)
+      router.emit(tag, Fluent::Engine.now, row)
     end
     client.close
   end

data/test/helper.rb

@@ -23,8 +23,7 @@ unless ENV.has_key?("VERBOSE")
   $log = nulllogger
 end
 
-require "fluent/plugin/in_rds_slowlog"
+require "fluent/plugin/in_rds_log"
 
 class Test::Unit::TestCase
 end
-

data/test/plugin/test_in_rds_slowlog.rb

@@ -13,7 +13,7 @@ class Rds_SlowlogInputTest < Test::Unit::TestCase
   ]
 
   def create_driver(conf = CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::Rds_SlowlogInput).configure(conf)
+    Fluent::Test::InputTestDriver.new(Fluent::Rds_LogInput).configure(conf)
   end
 
   def test_configure

metadata

@@ -1,64 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-log
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.30
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.30
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Amazon RDS slow_log and general_log input plugin for Fluent event collector
 email:
 - shinx1265@gmail.com
@@ -66,8 +79,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - '='
 - Gemfile
 - LICENSE.txt
@@ -80,27 +93,26 @@ files:
 - test/plugin/test_in_rds_slowlog.rb
 homepage: https://github.com/shinsaka/fluent-plugin-rds-log
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Amazon RDS slow_log and general_log input plugin for Fluent event collector
 test_files:
 - test/helper.rb