logstash-input-jdbc 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf7a5bf46a7c317d17c7e12169046979b19242c1
-  data.tar.gz: 26fe05b541b4a84b764e08d6f9527bda90329639
+  metadata.gz: 210deedb95591e0f409fc3461af2d79bb8a384e8
+  data.tar.gz: 8543b8a26df1cd6a80fcace0f7c7e54be175cf2e
 SHA512:
-  metadata.gz: 955833f1f3abe24e373a193cac7e34d27de4ba0245cfb7210955e45a4a650c512ecd8e1f2044de746d057b386123cb2bd2be5efaba705b9e1e581b8d2ee268cf
-  data.tar.gz: d36bc646854ef3409fe41055eca173eabcb9ea19913738d658fded3ae410c95f3169c9e9b1ff3ff8fc8a2532c9c48e779588e140543bc9a613a5606a9fcca6e2
+  metadata.gz: df9c7fa5e10be322919f607a815c9fe899f05da6bb348c599e2d35390f5a10b1647ea0fe8ef60c8c05cfa524b7db3e39ae89fa256f832b5972f467c17a72c462
+  data.tar.gz: d42eccdbab0331fc8e7e834e45fb0944e22eb9e1eb583782955bf34aa7cad8aab33fe9c6c9b29f43257992f11e4e5947cd177f83d4e10cc9fb6071d80880725a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.0.2
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 3.0.1
+  - New dependency requirements for logstash-core for the 5.0 release
 ## 3.0.0
   - [#57](https://github.com/logstash-plugins/logstash-input-jdbc/issues/57) New feature: Allow tracking by a column value rather than by last run time.  **This is a breaking change**, as users may be required to change from using `sql_last_start` to use `sql_last_value` in their queries.  No other changes are required if you've been using time-based queries.  See the documentation if you wish to use an incremental column value to track updates to your tables.
 

data/lib/logstash/inputs/jdbc.rb

@@ -95,6 +95,19 @@ require "yaml" # persistence
 # `tracking_column` is set. It is updated accordingly after subsequent queries are run.
 # |==========================================================
 #
+# Example:
+# [source,ruby]
+# ----------------------------------
+# input {
+#   jdbc {
+#     statement => "SELECT id, mycolumn1, mycolumn2 FROM my_table WHERE id > :sql_last_value"
+#     use_column_value => true
+#     tracking_column => id
+#     # ... other configuration bits
+#   }
+# }
+# ----------------------------------
+#
 class LogStash::Inputs::Jdbc < LogStash::Inputs::Base
   include LogStash::PluginMixins::Jdbc
   config_name "jdbc"

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -88,6 +88,11 @@ module LogStash::PluginMixins::Jdbc
     # Log level at which to log SQL queries, the accepted values are the common ones fatal, error, warn,
     # info and debug. The default value is info.
     config :sql_log_level, :validate => [ "fatal", "error", "warn", "info", "debug" ], :default => "info"
+
+    # Maximum number of times to try connecting to database
+    config :connection_retry_attempts, :validate => :number, :default => 1
+    # Number of seconds to sleep between connection attempts
+    config :connection_retry_attempts_wait_time, :validate => :number, :default => 0.5
   end
 
   private
@@ -97,14 +102,27 @@ module LogStash::PluginMixins::Jdbc
       :password => @jdbc_password.nil? ? nil : @jdbc_password.value,
       :pool_timeout => @jdbc_pool_timeout
     }.merge(@sequel_opts)
-    begin
-      Sequel.connect(@jdbc_connection_string, opts=opts)
-    rescue Sequel::PoolTimeout => e
-      @logger.error("Failed to connect to database. #{@jdbc_pool_timeout} second timeout exceeded.")
-      raise e
-    rescue Sequel::Error => e
-      @logger.error("Unable to connect to database", :error_message => e.message)
-      raise e
+    retry_attempts = @connection_retry_attempts
+    loop do
+      retry_attempts -= 1
+      begin
+        return Sequel.connect(@jdbc_connection_string, opts=opts)
+      rescue Sequel::PoolTimeout => e
+        if retry_attempts <= 0
+          @logger.error("Failed to connect to database. #{@jdbc_pool_timeout} second timeout exceeded. Tried #{@connection_retry_attempts} times.")
+          raise e
+        else
+          @logger.error("Failed to connect to database. #{@jdbc_pool_timeout} second timeout exceeded. Trying again.")  
+        end
+      rescue Sequel::Error => e
+        if retry_attempts <= 0
+          @logger.error("Unable to connect to database. Tried #{@connection_retry_attempts} times", :error_message => e.message, )
+          raise e
+        else
+          @logger.error("Unable to connect to database. Trying again", :error_message => e.message)
+        end
+      end
+      sleep(@connection_retry_attempts_wait_time)
     end
   end
 

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '3.0.0'
+  s.version         = '3.0.2'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This example input streams a string at a definable interval."
   s.description = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'sequel'
   s.add_runtime_dependency 'tzinfo'

data/spec/inputs/jdbc_spec.rb

@@ -746,7 +746,7 @@ describe LogStash::Inputs::Jdbc do
 
     it "should log error message" do
       allow(Sequel).to receive(:connect).and_raise(Sequel::PoolTimeout)
-      expect(plugin.logger).to receive(:error).with("Failed to connect to database. 0 second timeout exceeded.")
+      expect(plugin.logger).to receive(:error).with("Failed to connect to database. 0 second timeout exceeded. Tried 1 times.")
       expect { plugin.register }.to raise_error(Sequel::PoolTimeout)
     end
   end
@@ -818,4 +818,23 @@ describe LogStash::Inputs::Jdbc do
       end
     end
   end
+
+  context "when specifying connection_retry_attempts" do
+    let(:settings) { {"statement" => "SELECT 1 as col1 FROM test_table"} }
+
+    it "should try to connect connection_retry_attempts times" do
+      mixin_settings['connection_retry_attempts'] = 2
+      mixin_settings['jdbc_pool_timeout'] = 0
+      allow(Sequel).to receive(:connect).and_raise(Sequel::PoolTimeout)
+      expect(plugin.logger).to receive(:error).with("Failed to connect to database. 0 second timeout exceeded. Trying again.")
+      expect(plugin.logger).to receive(:error).with("Failed to connect to database. 0 second timeout exceeded. Tried 2 times.")
+      expect { plugin.register }.to raise_error(Sequel::PoolTimeout)
+    end
+
+    it "should not fail when passed a non-positive value" do
+      mixin_settings['connection_retry_attempts'] = -2
+      expect { plugin.register }.to_not raise_error
+      plugin.stop
+    end
+  end
 end

metadata

@@ -1,161 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sequel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: sequel
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: tzinfo
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: tzinfo
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: tzinfo-data
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: tzinfo-data
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rufus-scheduler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: rufus-scheduler
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: timecop
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jdbc-derby
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: jdbc-derby
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: docker-api
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: docker-api
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
@@ -183,12 +177,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []