Correctly close driver after a healthcheck failure

Fixes #227 .

Fixes #228

Author: andrewvc

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.2.1
+ - Fix bug where failed healthchecks would not call a non-existant method and suppress the real error
+
 ## 4.2.0
  - Automatically reconnect on connection issues
  - Fix test failures

lib/logstash/plugin_mixins/jdbc.rb

@@ -171,7 +171,7 @@ def open_jdbc_connection
       @database.test_connection
     rescue Sequel::DatabaseConnectionError => e
       @logger.warn("Failed test_connection.")
-      @database.close_jdbc_connection
+      close_jdbc_connection
 
       #TODO return false and let the plugin raise a LogStash::ConfigurationError
       raise e

logstash-input-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-jdbc'
-  s.version         = '4.2.1'
+  s.version         = '4.2.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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -28,4 +28,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'jdbc-derby'
+  s.add_development_dependency 'jdbc-mysql'
 end

spec/inputs/jdbc_spec.rb

@@ -2,6 +2,8 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/jdbc"
 require "jdbc/derby"
+require "jdbc/mysql"
+Jdbc::MySQL.load_driver
 require "sequel"
 require "sequel/adapters/jdbc"
 require "timecop"
@@ -26,19 +28,24 @@
   end
 
   before :each do
-    Jdbc::Derby.load_driver
-    db.create_table :test_table do
-      DateTime :created_at
-      Integer  :num
-      String   :string
-      DateTime :custom_time
-    end
-    db << "CREATE TABLE types_table (num INTEGER, string VARCHAR(255), started_at DATE, custom_time TIMESTAMP, ranking DECIMAL(16,6))"
+    if !RSpec.current_example.metadata[:no_connection]
+      # before body
+      Jdbc::Derby.load_driver
+      db.create_table :test_table do
+        DateTime :created_at
+        Integer  :num
+        String   :string
+        DateTime :custom_time
+      end
+      db << "CREATE TABLE types_table (num INTEGER, string VARCHAR(255), started_at DATE, custom_time TIMESTAMP, ranking DECIMAL(16,6))"
+    end
   end
 
   after :each do
-    db.drop_table(:test_table)
-    db.drop_table(:types_table)
+    if !RSpec.current_example.metadata[:no_connection]
+      db.drop_table(:test_table)
+      db.drop_table(:types_table)
+    end
   end
 
   context "when registering and tearing down" do
@@ -87,6 +94,24 @@
     end
   end
 
+  context "when connecting to a non-existent server", :no_connection => true do
+    let(:mixin_settings) do
+      super.merge(
+        "jdbc_driver_class" => "com.mysql.jdbc.Driver",
+        "jdbc_connection_string" => "jdbc:mysql://localhost:99999/somedb"
+      )
+    end
+    let(:settings) { super.merge("statement" => "SELECT 1 as col1 FROM test_table", "jdbc_user" => "foo", "jdbc_password" => "bar") }
+
+    it "should not register correctly" do
+        plugin.register
+        q = Queue.new
+        expect do
+          plugin.run(q)
+        end.to raise_error(::Sequel::DatabaseConnectionError)
+    end
+  end
+
   context "when both jdbc_password and jdbc_password_filepath arguments are passed" do
     let(:statement) { "SELECT * from test_table" }
     let(:jdbc_password) { "secret" }