fluent-plugin-sql 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e23b9247528a135033b20b8948e2c7c8553e8a7
-  data.tar.gz: 3f6b03e77450c220f17851b50c1f799e80f1e4e8
+  metadata.gz: ca9f3bc9d2178bcaa84c466b45a1077f0fc5a2b6
+  data.tar.gz: 09e653873d5740e19f972ec4328709e20f90aada
 SHA512:
-  metadata.gz: e6259bf6a96579679fa63f3cd7af978a8f5c23134a41438ba81f0c7d0744b3fd883f761c326156907e85d4b8f1d7d122f8841fbdd8905999f397f0a12a9f8ab2
-  data.tar.gz: 2eefbca9a6c289f8286bfe98472c43abe6cb5343c056f59f1490e67af65a2709157c1f7007e53fba102ef17f584352e2c139983768ec2a75b4bb9b11f1362b3f
+  metadata.gz: a8d5c1f6860b0f76fb27d4a7b83bfeeb0404492005b198b89a73d8f885eed2a0fcf1118a40a63aa2015cb85e4a90b028c46d7058785b836acce61a4f20525e2e
+  data.tar.gz: f9abb12f48ce89a31bf3ac604e85e3315bccb8d39706d96f06296adcc9d10a464f3e81e79f9a3524b37f5a962734defa35d8dd358949287965db6929fecfad3a

data/.travis.yml

@@ -5,10 +5,15 @@ addons:
   postgresql: "9.4"
 
 rvm:
-  - 2.0.0
+  - 2.0
   - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.4
+  - 2.3.1
+  - ruby-head
+
+gemfile:
+ - Gemfile
+ - Gemfile.v0.12
 
 before_install:
   - gem install bundler
@@ -18,3 +23,10 @@ before_script:
   - psql -U postgres -c "CREATE DATABASE fluentd_test OWNER fluentd;"
 
 script: bundle exec rake test
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  exclude:
+    - rvm: 2.0
+      gemfile: Gemfile

data/Gemfile.v0.12

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+gem 'json', '= 1.8.3'
+gem 'fluentd', '~> 0.12.0'
+
+gemspec

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/fluent/plugin/in_sql.rb

@@ -15,6 +15,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 #
+
+require "fluent/input"
+
 module Fluent
 
   require 'active_record'

data/lib/fluent/plugin/out_sql.rb

@@ -1,3 +1,5 @@
+require "fluent/output"
+
 module Fluent
   class SQLOutput < BufferedOutput
     Plugin.register_output('sql', self)
@@ -29,6 +31,8 @@ module Fluent
     config_param :socket, :string, :default => nil
     desc 'remove the given prefix from the events'
     config_param :remove_tag_prefix, :string, :default => nil
+    desc 'enable fallback'
+    config_param :enable_fallback, :bool, :default => true
 
     attr_accessor :tables
 
@@ -47,10 +51,11 @@ module Fluent
       attr_reader :model
       attr_reader :pattern
 
-      def initialize(pattern, log)
+      def initialize(pattern, log, enable_fallback)
         super()
         @pattern = MatchPattern.create(pattern)
         @log = log
+        @enable_fallback = enable_fallback
       end
 
       def configure(conf)
@@ -97,9 +102,14 @@ module Fluent
         begin
           @model.import(records)
         rescue ActiveRecord::StatementInvalid, ActiveRecord::Import::MissingColumnError => e
-          # ignore other exceptions to use Fluentd retry mechanizm
-          @log.warn "Got deterministic error. Fallback to one-by-one import", :error => e.message, :error_class => e.class
-          one_by_one_import(records)
+          if @enable_fallback
+            # ignore other exceptions to use Fluentd retry mechanizm
+            @log.warn "Got deterministic error. Fallback to one-by-one import", :error => e.message, :error_class => e.class
+            one_by_one_import(records)
+          else
+            $log.warn "Got deterministic error. Fallback is disabled", :error => e.message, :error_class => e.class
+            raise e
+          end
         end
       end
 
@@ -155,7 +165,7 @@ module Fluent
       conf.elements.select { |e|
         e.name == 'table'
       }.each { |e|
-        te = TableElement.new(e.arg, log)
+        te = TableElement.new(e.arg, log, @enable_fallback)
         te.configure(e)
         if e.arg.empty?
           $log.warn "Detect duplicate default table definition" if @default_table

data/test/plugin/test_out_sql.rb

@@ -38,7 +38,8 @@ class SqlOutputTest < Test::Unit::TestCase
       database: "fluentd_test",
       username: "fluentd",
       password: "fluentd",
-      remove_tag_suffix: /^db/
+      remove_tag_suffix: /^db/,
+      enable_fallback: true
     }
     actual = {
       host: d.instance.host,
@@ -47,7 +48,8 @@ class SqlOutputTest < Test::Unit::TestCase
       database: d.instance.database,
       username: d.instance.username,
       password: d.instance.password,
-      remove_tag_suffix: d.instance.remove_tag_prefix
+      remove_tag_suffix: d.instance.remove_tag_prefix,
+      enable_fallback: d.instance.enable_fallback
     }
     assert_equal(expected, actual)
     assert_empty(d.instance.tables)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -136,6 +136,7 @@ extra_rdoc_files: []
 files:
 - ".travis.yml"
 - Gemfile
+- Gemfile.v0.12
 - README.md
 - Rakefile
 - VERSION