logstash-output-jdbc 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41dff0734cecd8b90c11c38fa3b73de4f43d567a
-  data.tar.gz: 2545f0178b9c31b099a9d57ce8dc8e3e67dfce0a
+  metadata.gz: 42d30ecc15a727d77d8524f69d4e0a72609aee39
+  data.tar.gz: 92cda3714612b6cfea4bf7b29626456a16bb0bf1
 SHA512:
-  metadata.gz: 8252e3b02295b692bec722cd6c151ba2ab9e1f7b8119b8f483ee415bc3213eee4dd6f9b6b3fb5adc81d50308ad486a747322aded3affb740136952bbe0280633
-  data.tar.gz: 5ec626918c6bfb5b8bd13b8b1b781a84e0ae218d49d3cff790c511157b1711e39419fdef4660c6121d0488aed8c531ee66b686408a7d26070a301c18623066ff
+  metadata.gz: 2dd985a6dc5042ac302d4f5d0623f3c252c3de98f2c3c41ab6da69fff1156a6cf65d2e3a6e4412a02cf63b8eab1f3392a5a39b0f8d30b28a15a53a76b87afef7
+  data.tar.gz: 91c071c056330b22461f96b8874bc8fb9a0c2065d34d52b66622d74d6f791ea0f462be65a09e33eb4dbc9da707dd26442c591530b4ee0550454c9262e1e7721e

data/lib/logstash/outputs/jdbc.rb

@@ -286,10 +286,19 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
 
   def add_statement_event_params(statement, event)
     @statement[1..-1].each_with_index do |i, idx|
-      case event[i]
+      if i.is_a? String 
+        value = event[i]
+        if value.nil? and i =~ /%\{/
+          value = event.sprintf(i)
+        end
+      else
+        value = i
+      end
+      
+      case value
       when Time
         # See LogStash::Timestamp, below, for the why behind strftime.
-        statement.setString(idx + 1, event[i].strftime(STRFTIME_FMT))
+        statement.setString(idx + 1, value.strftime(STRFTIME_FMT))
       when LogStash::Timestamp
         # XXX: Using setString as opposed to setTimestamp, because setTimestamp
         # doesn't behave correctly in some drivers (Known: sqlite)
@@ -298,44 +307,44 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
         # 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))
+        statement.setString(idx + 1, value.time.strftime(STRFTIME_FMT))
       when Fixnum, Integer
-        statement.setInt(idx + 1, event[i])
+        statement.setInt(idx + 1, value)
       when Float
-        statement.setFloat(idx + 1, event[i])
+        statement.setFloat(idx + 1, value)
       when String
-        statement.setString(idx + 1, event[i])
-      when true
-        statement.setBoolean(idx + 1, true)
-      when false
-        statement.setBoolean(idx + 1, false)
+        statement.setString(idx + 1, value)
+      when true, false
+        statement.setBoolean(idx + 1, value)
       else
-        if event[i].nil? and i =~ /%\{/
-          statement.setString(idx + 1, event.sprintf(i))
-        else
-          statement.setString(idx + 1, nil)
-        end
+        statement.setString(idx + 1, nil)
       end
     end
 
     statement
   end
 
+
   def log_jdbc_exception(exception, retrying)
     current_exception = exception
+    log_text = 'JDBC - Exception. ' + (retrying ? 'Retrying' : 'Not retrying') + '.'
+    log_method = (retrying ? 'warn' : 'error')
+
     loop do
-      if retrying
-        @logger.error("JDBC Exception. Retrying.", :exception => current_exception)
+      @logger.send(log_method, log_text, :exception => current_exception, :backtrace => current_exception.backtrace)
+
+      if current_exception.respond_to? 'getNextException'
+        current_exception = current_exception.getNextException()
       else
-        @logger.error("JDBC Exception. No retry.", :exception => current_exception)
+        current_exception = nil
       end
-      current_exception = current_exception.getNextException()
+
       break if current_exception == nil
     end
   end
 
   def retry_exception?(exception)
-    retrying = (exception.respond_to? 'getSQLState' and RETRYABLE_SQLSTATE_CLASSES.include?(exception.getSQLState[0,2]))
+    retrying = (exception.respond_to? 'getSQLState' and RETRYABLE_SQLSTATE_CLASSES.include?(exception.getSQLState.to_s[0,2]))
     log_jdbc_exception(exception, retrying)
 
     retrying

metadata

@@ -1,49 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - the_angry_angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: stud
+  name: logstash-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
@@ -62,16 +62,16 @@ dependencies:
   name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.18
 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
@@ -81,17 +81,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/com/zaxxer/HikariCP/2.4.2/HikariCP-2.4.2.jar
+- lib/com/zaxxer/HikariCP/2.4.6/HikariCP-2.4.6.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-api/1.7.16/slf4j-api-1.7.16.jar
 - lib/org/slf4j/slf4j-log4j12/1.7.13/slf4j-log4j12-1.7.13.jar
+- lib/org/slf4j/slf4j-log4j12/1.7.21/slf4j-log4j12-1.7.21.jar
 - vendor/jar-dependencies/runtime-jars/HikariCP-2.4.2.jar
+- vendor/jar-dependencies/runtime-jars/HikariCP-2.4.6.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-api-1.7.16.jar
+- vendor/jar-dependencies/runtime-jars/slf4j-log4j12-1.7.21.jar
 - vendor/jar-dependencies/runtime-jars/slf4j-nop-1.7.13.jar
 - spec/outputs/jdbc_spec.rb
 - LICENSE.txt
@@ -102,8 +106,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message: logstash-output-jdbc 0.2.0 introduces several new features -
-  please ensure you check the documentation in the README file
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib