logstash-input-jdbc 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12acaddce06cd026085f24f5a2f3a98e7ed4601c
-  data.tar.gz: d3d94c320ded529e75f61bb179eec4e1a208c020
+  metadata.gz: f9a172f33d553e84914b76176ea860be37621cb1
+  data.tar.gz: 1ae5eedcd6b6d392c33b49f6050a661c1a564c4c
 SHA512:
-  metadata.gz: 3c3326f38200479396f9cc6c8baa547277d349f340262f958b4dc050c273d284f2d8f86b5fe219239d0508ce8615983ad7b0f6daa56c269aca66610dbb53caf5
-  data.tar.gz: a216617f9e1a6f25600cd4c35f0ff7dbcd32e2f0d14cfc2dd0d4dd9123b5a2204760b7e905e9ae269d06b8f54ddb702932b246d828033608c4ee1f5362a09588
+  metadata.gz: 7d2873101ca8ac7491d897317cd8e74dfb1681fd97fc574a4a9f21c1ea186e05278e942697a9c23420f949b4877084fc13d596da3dfafb44bb97d70e84f0f314
+  data.tar.gz: 607a3fcb288f023ae56cc6f3668c318e15addf16b4ec2911351ec82f099f0636a7409bce584b97743f22e78c6115d07c4f2d7ef7f295253f0463c11fb828cbc4

data/CHANGELOG.md

@@ -1,7 +1,11 @@
+## 2.0.3
+ - Added ability to configure timeout
+ - Added catch-all configuration option for any other options that Sequel lib supports
+
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
 
-* 1.0.0
-  - Initial release
+* 1.0.0
+  - Initial release

data/lib/logstash/plugin_mixins/jdbc.rb

@@ -57,6 +57,37 @@ module LogStash::PluginMixins::Jdbc
     # Connection pool configuration.
     # How often to validate a connection (in seconds)
     config :jdbc_validation_timeout, :validate => :number, :default => 3600
+
+    # Connection pool configuration.
+    # The amount of seconds to wait to acquire a connection before raising a PoolTimeoutError (default 5)
+    config :jdbc_pool_timeout, :validate => :number, :default => 5
+
+    # General/Vendor-specific Sequel configuration options.
+    #
+    # An example of an optional connection pool configuration
+    #    max_connections - The maximum number of connections the connection pool
+    #
+    # examples of vendor-specific options can be found in this
+    # documentation page: https://github.com/jeremyevans/sequel/blob/master/doc/opening_databases.rdoc
+    config :sequel_opts, :validate => :hash, :default => {}
+  end
+
+  private
+  def jdbc_connect
+    opts = {
+      :user => @jdbc_user,
+      :password => @jdbc_password,
+      :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
+    end
   end
 
   public
@@ -76,7 +107,7 @@ module LogStash::PluginMixins::Jdbc
                 end
       raise LogStash::ConfigurationError, "#{e}. #{message}"
     end
-    @database = Sequel.connect(@jdbc_connection_string, :user=> @jdbc_user, :password=>  @jdbc_password.nil? ? nil : @jdbc_password.value)
+    @database = jdbc_connect()
     @database.extension(:pagination)
     if @jdbc_validate_connection
       @database.extension(:connection_validator)

data/logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '2.0.2'
+  s.version         = '2.0.3'
   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"

data/spec/inputs/jdbc_spec.rb

@@ -310,4 +310,37 @@ describe LogStash::Inputs::Jdbc do
       expect { plugin.register }.to raise_error(LogStash::ConfigurationError)
     end
   end
+
+  context "when timing out on connection" do
+    let(:settings) do
+      {
+        "statement" => "SELECT * FROM test_table",
+        "jdbc_pool_timeout" => 0,
+        "jdbc_connection_string" => 'mock://localhost:1527/db',
+        "sequel_opts" => {
+          "max_connections" => 1
+        }
+      }
+    end
+
+    it "should raise PoolTimeout error" do
+      plugin.register
+      db = plugin.instance_variable_get(:@database)
+      expect(db.pool.instance_variable_get(:@timeout)).to eq(0)
+      expect(db.pool.instance_variable_get(:@max_size)).to eq(1)
+
+      q, q1 = Queue.new, Queue.new
+      t = Thread.new{db.pool.hold{|c| q1.push nil; q.pop}}
+      q1.pop
+      expect{db.pool.hold {|c|}}.to raise_error(Sequel::PoolTimeout)
+      q.push nil
+      t.join
+    end
+
+    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.register }.to raise_error(Sequel::PoolTimeout)
+    end
+  end
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,119 +28,121 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
+  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'
   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: 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: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logstash/inputs/jdbc.rb
+- lib/logstash/plugin_mixins/jdbc.rb
+- spec/inputs/jdbc_spec.rb
+- logstash-input-jdbc.gemspec
+- README.md
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- lib/logstash/inputs/jdbc.rb
-- lib/logstash/plugin_mixins/jdbc.rb
-- logstash-input-jdbc.gemspec
-- spec/inputs/jdbc_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This example input streams a string at a definable interval.