fluent-plugin-rds-pgsql-log 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490d5c629a6533d73d1c2a85ad7ccf8962ac6d30
-  data.tar.gz: e892a87af285abe6a941ce5387f52507bb9569eb
+  metadata.gz: a19cfb030a36b84f37a0715f2e8a613d63930cac
+  data.tar.gz: bf7d64fc9cb5552e11b5125dccdb4ddfc55b48a1
 SHA512:
-  metadata.gz: 04b299e27b14de7411e573cdfc3d4d16579a3ee069e1afaab07e04ff2e7e2819fdaf35a0d1edf4d8048d277211bc50f5125e519e39582a559c39b630d38c6078
-  data.tar.gz: 1bbd9858e9b20f54fcc8f93da6cb61be9ef987f7dfc8cf4c74b017567e540bb0934ddd3f476d1117788df05046741fda1db205ddd56d25cb871d56c382f1f9f0
+  metadata.gz: e42cccd4e4ccf39f5625bb758835b3fb29df474d197e4f3d964c8d153734a911cba209ae7bb02f7d499205ed753b6bef7d10700edac24be2eaea3f59c290e5aa
+  data.tar.gz: 69b08f190611b337def1d02fc375e68972be5e0dae197f95de10698f703187920cba473c211f3325d2c4fd01239f22f7a2ddc195abcdcbc9470b5dfea30f0ada

data/README.md

@@ -1,11 +1,13 @@
 # Amazon RDS for PostgreSQL log input plugin for fluentd
 
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-rds-pgsql-log.svg)](https://badge.fury.io/rb/fluent-plugin-rds-pgsql-log)
+
 ## Overview
 - Amazon Web Services RDS log input plugin for fluentd
 
 ## Installation
 
-    $ fluentd-gem fluent-plugin-rds-pgsql-log
+    $ fluentd-gem install fluent-plugin-rds-pgsql-log
 
 ## AWS ELB Settings
 - settings see: [PostgreSQL Database Log Files](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.Concepts.PostgreSQL.html)
@@ -70,3 +72,7 @@ SSL_CERT_FILE=/etc/ssl/certs/ca-bundle.crt (If you using amazon linux)
 }
 ```
 
+## Changes
+### 0.2.0
+- require fluentd version 0.14.0
+

data/fluent-plugin-rds-pgsql-log.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-rds-pgsql-log"
-  spec.version       = "0.1.0"
+  spec.version       = "0.2.0"
   spec.authors       = ["shinsaka"]
   spec.email         = ["shinx1265@gmail.com"]
   spec.summary       = "Amazon RDS for PostgreSQL log input plugin"
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fluentd", "~> 0"
+  spec.add_dependency "fluentd", ">= 0.14.0", "< 2"
   spec.add_dependency "aws-sdk", "~> 2"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/fluent.conf.sample

@@ -1,5 +1,5 @@
 <source>
-  type rds_pgsql_log
+  @type rds_pgsql_log
   access_key_id     XXXXXXXXXXXXXXXXXXXX
   secret_access_key xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
   region ap-northeast-1
@@ -10,5 +10,5 @@
 </source>
 
 <match pgsql.log>
-  type stdout
+  @type stdout
 </match>

data/lib/fluent/plugin/in_rds_pgsql_log.rb

@@ -1,4 +1,7 @@
-class Fluent::RdsPgsqlLogInput < Fluent::Input
+require 'fluent/input'
+require 'aws-sdk'
+
+class Fluent::Plugin::RdsPgsqlLogInput < Fluent::Plugin::Input
   Fluent::Plugin.register_input('rds_pgsql_log', self)
 
   LOG_REGEXP = /^(?<time>\d{4}-\d{2}-\d{2} \d{2}\:\d{2}\:\d{2} .+?):(?<host>.*?):(?<user>.*?)@(?<database>.*?):\[(?<pid>.*?)\]:(?<message_level>.*?):(?<message>.*)$/
@@ -13,13 +16,12 @@ class Fluent::RdsPgsqlLogInput < Fluent::Input
 
   def configure(conf)
     super
-    require 'aws-sdk'
 
+    raise Fluent::ConfigError.new("region is required") unless @region
     if !has_iam_role?
       raise Fluent::ConfigError.new("access_key_id is required") if @access_key_id.nil?
       raise Fluent::ConfigError.new("secret_access_key is required") if @secret_access_key.nil?
     end
-    raise Fluent::ConfigError.new("region is required") unless @region
     raise Fluent::ConfigError.new("db_instance_identifier is required") unless @db_instance_identifier
     raise Fluent::ConfigError.new("pos_file is required") unless @pos_file
     raise Fluent::ConfigError.new("refresh_interval is required") unless @refresh_interval
@@ -55,7 +57,6 @@ class Fluent::RdsPgsqlLogInput < Fluent::Input
     super
     @loop.stop
     @thread.join
-    @timestamp_file.close
   end
 
   private
@@ -196,7 +197,7 @@ class Fluent::RdsPgsqlLogInput < Fluent::Input
           record["message"] << "\n" + raw_record unless record.nil?
         else
           # emit before record
-          Fluent::Engine.emit(@tag, Fluent::Engine.now, record) unless record.nil?
+          router.emit(@tag, Fluent::Engine.now, record) unless record.nil?
 
           # set a record
           record = {
@@ -212,7 +213,7 @@ class Fluent::RdsPgsqlLogInput < Fluent::Input
         end
       end
       # emit last record
-      Fluent::Engine.emit(@tag, Fluent::Engine.now, record) unless record.nil?
+      router.emit(@tag, Fluent::Engine.now, record) unless record.nil?
     rescue => e
       $log.warn e.message
     end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rds-pgsql-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - shinsaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2017-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Amazon RDS for PostgreSQL log input plugin