logstash-output-jdbc 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc8ddfe645eb52236a43bd311160e9b1bb6cb13
-  data.tar.gz: e5dbdf7eaa611c69380423ec6e2d318bafd295d0
+  metadata.gz: 41dff0734cecd8b90c11c38fa3b73de4f43d567a
+  data.tar.gz: 2545f0178b9c31b099a9d57ce8dc8e3e67dfce0a
 SHA512:
-  metadata.gz: 738fe21719d3f903744fa61c721ef5ec197416089d04d42be0574234d28a692792c24927bef85dd9e2bb511f0ae63bc09c23b6f161fd33b72cdf3b0c6c8ba5e7
-  data.tar.gz: 18652ad8984829a32fad82e7af6972b34356e6eeb07e01bade6caf71bf148f6bc8e06feb6c7568ac7df8d8328d2017acfe0705c55c30b6d2b14475df2dce781a
+  metadata.gz: 8252e3b02295b692bec722cd6c151ba2ab9e1f7b8119b8f483ee415bc3213eee4dd6f9b6b3fb5adc81d50308ad486a747322aded3affb740136952bbe0280633
+  data.tar.gz: 5ec626918c6bfb5b8bd13b8b1b781a84e0ae218d49d3cff790c511157b1711e39419fdef4660c6121d0488aed8c531ee66b686408a7d26070a301c18623066ff

data/lib/logstash/outputs/jdbc.rb

@@ -151,7 +151,6 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
 
     if @exceptions_tracker.reject { |i| i.nil? }.count >= @max_flush_exceptions
       @logger.error("JDBC - max_flush_exceptions has been reached")
-      log_jdbc_exception(e)
       raise LogStash::ShutdownSignal.new
     end
   end
@@ -223,7 +222,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     begin
       connection = @pool.getConnection()
     rescue => e
-      log_jdbc_exception(e)
+      log_jdbc_exception(e, true)
       raise
     end
 
@@ -242,7 +241,6 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
       statement.close()
       @exceptions_tracker << nil
     rescue => e
-      log_jdbc_exception(e)
       if retry_exception?(e)
         raise
       end
@@ -258,7 +256,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     begin
       connection = @pool.getConnection()
     rescue => e
-      log_jdbc_exception(e)
+      log_jdbc_exception(e, true)
       raise
     end
 
@@ -277,7 +275,6 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
         @exceptions_tracker << nil
       end
     rescue => e
-      log_jdbc_exception(e)
       if retry_exception?(e)
         raise
       end
@@ -324,17 +321,23 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     statement
   end
 
-  def log_jdbc_exception(exception)
+  def log_jdbc_exception(exception, retrying)
     current_exception = exception
     loop do
-      @logger.error("JDBC Exception encountered: Will automatically retry.", :exception => current_exception)
+      if retrying
+        @logger.error("JDBC Exception. Retrying.", :exception => current_exception)
+      else
+        @logger.error("JDBC Exception. No retry.", :exception => current_exception)
+      end
       current_exception = current_exception.getNextException()
       break if current_exception == nil
     end
   end
 
   def retry_exception?(exception)
-    return (exception.class != java.sql.SQLException or 
-      RETRYABLE_SQLSTATE_CLASSES.include?(e.getSQLState[0,2]))
+    retrying = (exception.respond_to? 'getSQLState' and RETRYABLE_SQLSTATE_CLASSES.include?(exception.getSQLState[0,2]))
+    log_jdbc_exception(exception, retrying)
+
+    retrying
   end
 end # class LogStash::Outputs::jdbc

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - the_angry_angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core