logstash-output-jdbc 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88f25634e6067acc5b2bcd6bae08adae1f62a5f
-  data.tar.gz: 6ebea2d9323ca3bae2b734b245920d026ea51709
+  metadata.gz: 6fc8ddfe645eb52236a43bd311160e9b1bb6cb13
+  data.tar.gz: e5dbdf7eaa611c69380423ec6e2d318bafd295d0
 SHA512:
-  metadata.gz: bf46d1ecbdc8b5db28325b698385a17e742a158499b005a39ead100e86183c3a368a5cd93bf03d91d018f02a110b4b79d5064d485a02bbb95068fba1398fa532
-  data.tar.gz: fe60eb738931dc120e2a10323548f5bad8de45945e3d1d8d3e09d7eac94e55cf5190b78c3b5a1f078bc264fec272e583ccbce9f9487cc169df97f5728821bda7
+  metadata.gz: 738fe21719d3f903744fa61c721ef5ec197416089d04d42be0574234d28a692792c24927bef85dd9e2bb511f0ae63bc09c23b6f161fd33b72cdf3b0c6c8ba5e7
+  data.tar.gz: 18652ad8984829a32fad82e7af6972b34356e6eeb07e01bade6caf71bf148f6bc8e06feb6c7568ac7df8d8328d2017acfe0705c55c30b6d2b14475df2dce781a

data/lib/logstash/outputs/jdbc.rb

@@ -6,10 +6,33 @@ require "java"
 require "logstash-output-jdbc_jars"
 require "logstash-output-jdbc_ring-buffer"
 
+# Write events to a SQL engine, using JDBC.
+#
+# It is upto the user of the plugin to correctly configure the plugin. This
+# includes correctly crafting the SQL statement, and matching the number of
+# parameters correctly.
 class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   # Adds buffer support
   include Stud::Buffer
 
+  STRFTIME_FMT = '%Y-%m-%d %T.%L'.freeze
+
+  RETRYABLE_SQLSTATE_CLASSES = [
+    # Classes of retryable SQLSTATE codes
+    # Not all in the class will be retryable. However, this is the best that 
+    # we've got right now.
+    # If a custom state code is required, set it in retry_sql_states.
+    '08', # Connection Exception
+    '24', # Invalid Cursor State (Maybe retry-able in some circumstances)
+    '25', # Invalid Transaction State 
+    '40', # Transaction Rollback 
+    '53', # Insufficient Resources
+    '54', # Program Limit Exceeded (MAYBE)
+    '55', # Object Not In Prerequisite State
+    '57', # Operator Intervention
+    '58', # System Error
+  ].freeze
+
   config_name "jdbc"
 
   # Driver class - Reintroduced for https://github.com/theangryangel/logstash-output-jdbc/issues/26
@@ -196,8 +219,15 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   def safe_flush(events, teardown=false)
     connection = nil
     statement = nil
+    
     begin
       connection = @pool.getConnection()
+    rescue => e
+      log_jdbc_exception(e)
+      raise
+    end
+
+    begin
       statement = connection.prepareStatement(@statement[0])
 
       events.each do |event|
@@ -213,6 +243,9 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
       @exceptions_tracker << nil
     rescue => e
       log_jdbc_exception(e)
+      if retry_exception?(e)
+        raise
+      end
     ensure
       statement.close() unless statement.nil?
       connection.close() unless connection.nil?
@@ -224,7 +257,12 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     statement = nil
     begin
       connection = @pool.getConnection()
+    rescue => e
+      log_jdbc_exception(e)
+      raise
+    end
 
+    begin
       events.each do |event|
         next if event.cancelled?
 
@@ -240,6 +278,9 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
       end
     rescue => e
       log_jdbc_exception(e)
+      if retry_exception?(e)
+        raise
+      end
     ensure
       statement.close() unless statement.nil?
       connection.close() unless connection.nil?
@@ -250,11 +291,17 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     @statement[1..-1].each_with_index do |i, idx|
       case event[i]
       when Time
-        # Most reliable solution, cross JDBC driver
-        statement.setString(idx + 1, event[i].iso8601())
+        # See LogStash::Timestamp, below, for the why behind strftime.
+        statement.setString(idx + 1, event[i].strftime(STRFTIME_FMT))
       when LogStash::Timestamp
-        # Most reliable solution, cross JDBC driver
-        statement.setString(idx + 1, event[i].to_iso8601())
+        # XXX: Using setString as opposed to setTimestamp, because setTimestamp
+        # doesn't behave correctly in some drivers (Known: sqlite)
+        #
+        # Additionally this does not use `to_iso8601`, since some SQL databases
+        # choke on the 'T' in the string (Known: Derby).
+        #
+        # strftime appears to be the most reliable across drivers.
+        statement.setString(idx + 1, event[i].time.strftime(STRFTIME_FMT))
       when Fixnum, Integer
         statement.setInt(idx + 1, event[i])
       when Float
@@ -285,4 +332,9 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
       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]))
+  end
 end # class LogStash::Outputs::jdbc

data/spec/outputs/jdbc_spec.rb

@@ -10,10 +10,7 @@ describe LogStash::Outputs::Jdbc do
       "driver_class" => "org.apache.derby.jdbc.EmbeddedDriver",
       "connection_string" => "jdbc:derby:memory:testdb;create=true",
       "driver_jar_path" => ENV['JDBC_DERBY_JAR'],
-      # Grumble. Grumble.
-      # Derby doesn't like 'T' in timestamps as of current writing, so for now
-      # we'll just use CURRENT_TIMESTAMP as opposed to the event @timestamp
-      "statement" => [ "insert into log (created_at, message) values(CURRENT_TIMESTAMP, ?)", "message" ]
+      "statement" => [ "insert into log (created_at, message) values(?, ?)", "@timestamp" "message" ]
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - the_angry_angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-02 00:00:00.000000000 Z
+date: 2016-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -80,11 +80,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/com/zaxxer/HikariCP/2.4.2/HikariCP-2.4.2.jar
+- lib/log4j/log4j/1.2.17/log4j-1.2.17.jar
 - lib/logstash/outputs/jdbc.rb
 - lib/logstash-output-jdbc_jars.rb
 - lib/logstash-output-jdbc_ring-buffer.rb
+- lib/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar
+- lib/org/slf4j/slf4j-log4j12/1.7.13/slf4j-log4j12-1.7.13.jar
 - vendor/jar-dependencies/runtime-jars/HikariCP-2.4.2.jar
+- vendor/jar-dependencies/runtime-jars/log4j-1.2.17.jar
+- vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.12.jar
 - vendor/jar-dependencies/runtime-jars/slf4j-api-1.7.13.jar
+- vendor/jar-dependencies/runtime-jars/slf4j-log4j12-1.7.13.jar
 - vendor/jar-dependencies/runtime-jars/slf4j-nop-1.7.13.jar
 - spec/outputs/jdbc_spec.rb
 - LICENSE.txt