logstash-integration-jdbc 5.1.7 → 5.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 631bf72cc9e0bb40840f5e7537919e0501a766ddc020a970508004dbebe19d9e
-  data.tar.gz: d712fc0933239f37b56c88b3cfb7de121452ea07901ed7a17ce6339b0f351fc5
+  metadata.gz: 70e445fd000df9ba4c631d3574d67826aaafcb22bb2b4c00f9e30aa386415ed0
+  data.tar.gz: 2fc2cef288fa7fa2f342db6096e79e49617c012e5ce9f5c4a5d94cc1f79b0838
 SHA512:
-  metadata.gz: 304d561709459feb36273bfb95cfb8dcc50aa86f2fe39d9f0af7153cdef5dbdbe91c934d8bf5c015f2c7b16ccba679042e8713f6460101b626bce79c7d2d1d3a
-  data.tar.gz: 220f00788a142ec81d5b00b0fd370ae15a02709553a28679351e04d1551252c080f2a6f62a11d1a61fe832f2e77ca0259d31b570834242277d18a09670ee38c3
+  metadata.gz: e9fd72a1ebd12db838330101716032fbe125a9dab866bd552e61eeca37d51222f1f22e29cb8cdcc1b27bba8d1e5b59e8ff22de6aba29587e3811543a23860e79
+  data.tar.gz: ae0322899fdbc65f3be931f1e2fbc2cbb82ac7d3e9980c1aa1a404085a0d4e7218944567e4750260fd638506e6f43dceb6a477c4762fe856d3c262e152988920

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.1.8
+  - Fix the blocking pipeline reload and shutdown when connectivity issues happen [#85](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/85)
+
 ## 5.1.7
   - Normalize jdbc_driver_class loading to support any top-level java packages [#86](https://github.com/logstash-plugins/logstash-integration-jdbc/pull/86)
 

data/lib/logstash/plugin_mixins/jdbc/jdbc.rb

@@ -168,8 +168,6 @@ module LogStash  module PluginMixins module Jdbc
         @logger.warn("Failed test_connection with java.sql.SQLException.", :exception => e)
       rescue Sequel::DatabaseConnectionError => e
         @logger.warn("Failed test_connection.", :exception => e)
-        close_jdbc_connection
-
         #TODO return false and let the plugin raise a LogStash::ConfigurationError
         raise e
       end
@@ -208,9 +206,9 @@ module LogStash  module PluginMixins module Jdbc
     public
     def execute_statement
       success = false
-      @connection_lock.lock
-      open_jdbc_connection
       begin
+        @connection_lock.lock
+        open_jdbc_connection
         sql_last_value = @use_column_value ? @value_tracker.value : Time.now.utc
         @tracking_column_warning_sent = false
         @statement_handler.perform_query(@database, @value_tracker.value, @jdbc_paging_enabled, @jdbc_page_size) do |row|

data/logstash-integration-jdbc.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-integration-jdbc'
-  s.version         = '5.1.7'
+  s.version         = '5.1.8'
   s.licenses = ['Apache License (2.0)']
   s.summary         = "Integration with JDBC - input and filter plugins"
   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"
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-mixin-event_support", '~> 1.0'
 
   s.add_development_dependency "childprocess"
-  s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-devutils', '>= 2.3'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'jdbc-derby'
 end

data/spec/inputs/integration/integ_spec.rb

@@ -66,13 +66,13 @@ describe LogStash::Inputs::Jdbc, :integration => true do
       )
     end
 
-    it "should not register correctly" do
+    it "log warning msg when plugin run" do
       plugin.register
-      allow( plugin ).to receive(:log_java_exception)
+      expect( plugin ).to receive(:log_java_exception)
+      expect(plugin.logger).to receive(:warn).once.with("Exception when executing JDBC query",
+                                                        hash_including(:exception => instance_of(String)))
       q = Queue.new
-      expect do
-        plugin.run(q)
-      end.to raise_error(::Sequel::DatabaseConnectionError)
+      expect{ plugin.run(q) }.not_to raise_error
     end
 
     it "should log (native) Java driver error" do
@@ -85,9 +85,7 @@ describe LogStash::Inputs::Jdbc, :integration => true do
         logger
       end
       q = Queue.new
-      expect do
-        plugin.run(q)
-      end.to raise_error(::Sequel::DatabaseConnectionError)
+      expect{ plugin.run(q) }.not_to raise_error
     end
   end
 end

data/spec/inputs/jdbc_spec.rb

@@ -1393,10 +1393,8 @@ describe LogStash::Inputs::Jdbc do
       event = queue.pop
       expect(event.get("num")).to eq(1)
       expect(event.get("string")).to eq("A test")
-      expect(event.get("started_at")).to be_a(LogStash::Timestamp)
-      expect(event.get("started_at").to_s).to eq("1999-12-31T00:00:00.000Z")
-      expect(event.get("custom_time")).to be_a(LogStash::Timestamp)
-      expect(event.get("custom_time").to_s).to eq("1999-12-31T23:59:59.000Z")
+      expect(event.get("started_at")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T00:00:00.000Z")
+      expect(event.get("custom_time")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T23:59:59.000Z")
       expect(event.get("ranking").to_f).to eq(95.67)
     end
   end
@@ -1442,10 +1440,8 @@ describe LogStash::Inputs::Jdbc do
         event = queue.pop
         expect(event.get("num")).to eq(1)
         expect(event.get("string")).to eq("A test")
-        expect(event.get("started_at")).to be_a(LogStash::Timestamp)
-        expect(event.get("started_at").to_s).to eq("1999-12-31T00:00:00.000Z")
-        expect(event.get("custom_time")).to be_a(LogStash::Timestamp)
-        expect(event.get("custom_time").to_s).to eq("1999-12-31T23:59:59.000Z")
+        expect(event.get("started_at")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T00:00:00.000Z")
+        expect(event.get("custom_time")).to be_a_logstash_timestamp_equivalent_to("1999-12-31T23:59:59.000Z")
         expect(event.get("ranking").to_f).to eq(95.67)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-jdbc
 version: !ruby/object:Gem::Version
-  version: 5.1.7
+  version: 5.1.8
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   name: logstash-devutils
   prerelease: false
   type: :development
@@ -211,7 +211,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: