fluent-plugin-sql 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e7109d0e58f4123b5e6613a7e3127f973bc8737
-  data.tar.gz: 357be8e497c0f70bb812fba8b1e2fc56ed6f6dc5
+  metadata.gz: d602eab48f2e5a82afd2805ea57198d5517bb1b7
+  data.tar.gz: fec9b91b4f26b49f9f8262adbf86e0a29b6b9c6a
 SHA512:
-  metadata.gz: fa2466fca780b65bd04b58eac4d35da7d63129041b4b6ef7e64542994d50d02f5d0f089110005f17df649bc05a28a1108807d8ec9876e8115ed5bc254ed71391
-  data.tar.gz: 1d329df0669bf47b5b116587b6db54c3ef0d1fb674f7bd09a58d6979dc6371fea3aac9a083bc385a31b78a42745d9359dba7cdb40313078f611b63b89f47f0c8
+  metadata.gz: 4e3909a2229451959f1ce21d69febb6ca102dae935da5944feb9895510f655fa0349b4f9b737bfdeba02533de55f7ac4dffab32f7cfe1e8beb80bb40864aa600
+  data.tar.gz: 82ec1c90fc5b4a0436a20235f2839d892a94eef18e3154823526b322a1f0547f0fe0b3019538b9e07a9b473e0b0581af65471452e3ec905524c21c94c5cdd4fd

data/.travis.yml

@@ -0,0 +1,4 @@
+sudo: false
+
+before_install:
+  - gem install bundler

data/README.md

@@ -30,7 +30,7 @@ It stores last selected rows to a file (named *state\_file*) to not forget the l
 ## Input: Configuration
 
     <source>
-      type sql
+      @type sql
 
       host rdb_host
       database rdb_database
@@ -96,7 +96,7 @@ This plugin takes advantage of ActiveRecord underneath. For `host`, `port`, `dat
 ## Output: Configuration
 
     <match my.rdb.*>
-      type sql
+      @type sql
       host rdb_host
       port 3306
       database rdb_database

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/fluent-plugin-sql.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.license = "Apache-2.0"
 
-  gem.add_dependency "fluentd", [">= 0.10.58", "< 2"]
+  gem.add_dependency "fluentd", [">= 0.12.17", "< 2"]
   gem.add_dependency 'activerecord', "~> 4.2"
   gem.add_dependency 'activerecord-import', "~> 0.7"
   gem.add_development_dependency "rake", ">= 0.9.2"

data/lib/fluent/plugin/in_sql.rb

@@ -22,17 +22,36 @@ module Fluent
   class SQLInput < Input
     Plugin.register_input('sql', self)
 
+    # For fluentd v0.12.16 or earlier
+    class << self
+      unless method_defined?(:desc)
+        def desc(description)
+        end
+      end
+    end
+
+    desc 'RDBMS host'
     config_param :host, :string
+    desc 'RDBMS port'
     config_param :port, :integer, :default => nil
+    desc 'RDBMS driver name.'
     config_param :adapter, :string
+    desc 'RDBMS database name'
     config_param :database, :string
+    desc 'RDBMS login user name'
     config_param :username, :string, :default => nil
+    desc 'RDBMS login password'
     config_param :password, :string, :default => nil, :secret => true
+    desc 'RDBMS socket path'
     config_param :socket, :string, :default => nil
 
+    desc 'path to a file to store last rows'
     config_param :state_file, :string, :default => nil
+    desc 'prefix of tags of events. actual tag will be this_tag_prefix.tables_tag (optional)'
     config_param :tag_prefix, :string, :default => nil
+    desc 'interval to run SQLs (optional)'
     config_param :select_interval, :time, :default => 60
+    desc 'limit of number of rows for each SQL(optional)'
     config_param :select_limit, :time, :default => 500
 
     unless method_defined?(:log)
@@ -86,8 +105,7 @@ module Fluent
 
         # if update_column is not set, here uses primary key
         unless @update_column
-          columns = Hash[@model.columns.map {|c| [c.name, c] }]
-          pk = columns[@model.primary_key]
+          pk = @model.columns_hash[@model.primary_key]
           unless pk
             raise "Composite primary key is not supported. Set update_column parameter to <table> section."
           end
@@ -105,7 +123,6 @@ module Fluent
         relation = relation.limit(limit) if limit > 0
 
         now = Engine.now
-        entry_name = @model.table_name.singularize
 
         me = MultiEventStream.new
         relation.each do |obj|
@@ -226,6 +243,14 @@ module Fluent
       until @stop_flag
         sleep @select_interval
 
+        begin
+          conn = @base_model.connection
+          conn.active? || conn.reconnect!
+        rescue => e
+          log.warn "can't connect to database. Reconnect at next try"
+          next
+        end
+
         @tables.each do |t|
           begin
             last_record = @state_store.last_records[t.table]

data/lib/fluent/plugin/out_sql.rb

@@ -5,13 +5,29 @@ module Fluent
     include SetTimeKeyMixin
     include SetTagKeyMixin
 
+    # For fluentd v0.12.16 or earlier
+    class << self
+      unless method_defined?(:desc)
+        def desc(description)
+        end
+      end
+    end
+
+    desc 'RDBMS host'
     config_param :host, :string
+    desc 'RDBMS port'
     config_param :port, :integer, :default => nil
+    desc 'RDBMS driver name.'
     config_param :adapter, :string
+    desc 'RDBMS login user name'
     config_param :username, :string, :default => nil
+    desc 'RDBMS login password'
     config_param :password, :string, :default => nil, :secret => true
+    desc 'RDBMS database name'
     config_param :database, :string
+    desc 'RDBMS socket path'
     config_param :socket, :string, :default => nil
+    desc 'remove the given prefix from the events'
     config_param :remove_tag_prefix, :string, :default => nil
 
     attr_accessor :tables
@@ -64,7 +80,7 @@ module Fluent
         @model.define_singleton_method(:model_name) { model_name }
 
         # TODO: check column_names and table schema
-        columns = @model.columns.map { |column| column.name }.sort
+        # @model.column_names
       end
 
       def import(chunk)
@@ -199,6 +215,9 @@ module Fluent
     end
 
     def write(chunk)
+      conn = @base_model.connection
+      conn.active? || conn.reconnect!
+
       @tables.each { |table|
         if table.pattern.match(chunk.key)
           return table.import(chunk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.12.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.58
+        version: 0.12.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -78,6 +78,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile