logstash-output-jdbc 0.2.5 → 0.2.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42579f38d0761b8192520ef41f03c42d501b139a
-  data.tar.gz: 1ef31995f6535109cf5caedb1c91a8a90aac6c25
+  metadata.gz: d7ca2b9a39fb1b59ff36a652c34d078479379478
+  data.tar.gz: e856cfc5cd4b226eadd2a371b6a8cb87bbeaac9d
 SHA512:
-  metadata.gz: 84a86a3afda777d90da998f4b37eebcb7a64bd8704dbc44b7084764d3dba29009506468d107ecd3c6069014da887581369fb1faf714a39572dd8dabd83961f9c
-  data.tar.gz: 8b3288422002936ba26d3c3bc125935248690c869d1f687e128f1faf5d2e89ed9c2007f093193c2ec33edc143a367a20a39710b7f4207f5c054a157f175d5779
+  metadata.gz: 61431d233a16c533f11b19f439d0a71d8df67effc839dd9b2df9841e2a83de708f6c766eb32bd81f58525011c7179f31fe4ab0ba80468ff7b63607820bb3b5ff
+  data.tar.gz: ff99288699de683e16d8511220e5e28341c695a94068ff0772825ba54e72c003d261645e7301209665c1250bd6d6e19be4ec7987eaee2fa7888387f67fc36a9f

data/README.md

@@ -1,4 +1,7 @@
-# logstash-output-jdbc
+# logstash-output-jdbc 
+
+[![Build Status](https://travis-ci.org/theangryangel/logstash-output-jdbc.svg?branch=master)](https://travis-ci.org/theangryangel/logstash-output-jdbc)
+
 This plugin is provided as an external plugin and is not part of the Logstash project.
 
 This plugin allows you to output to SQL databases, using JDBC adapters.
@@ -6,7 +9,7 @@ See below for tested adapters, and example configurations.
 
 This has not yet been extensively tested with all JDBC drivers and may not yet work for you.
 
-If you do find this works for a JDBC driver not listed, let me know and provide a small example configuration.
+If you do find this works for a JDBC driver without an example, let me know and provide a small example configuration if you can.
 
 This plugin does not bundle any JDBC jar files, and does expect them to be in a
 particular location. Please ensure you read the 4 installation lines below.

data/lib/logstash/outputs/jdbc.rb

@@ -98,7 +98,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
     end
 
     setup_and_test_pool!
-    
+
     buffer_initialize(
       :max_items => @flush_size,
       :max_interval => @idle_flush_time,
@@ -194,56 +194,55 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   end
 
   def safe_flush(events, teardown=false)
-    connection = @pool.getConnection()
-    statement = connection.prepareStatement(@statement[0])
+    connection = nil
+    statement = nil
+    begin
+      connection = @pool.getConnection()
+      statement = connection.prepareStatement(@statement[0])
 
-    events.each do |event|
-      next if event.cancelled?
-      next if @statement.length < 2
-      statement = add_statement_event_params(statement, event)
+      events.each do |event|
+        next if event.cancelled?
+        next if @statement.length < 2
+        statement = add_statement_event_params(statement, event)
 
-      statement.addBatch()
-    end
+        statement.addBatch()
+      end
 
-    begin
       statement.executeBatch()
       statement.close()
       @exceptions_tracker << nil
-      
     rescue => e
-      # Raising an exception will incur a retry from Stud::Buffer.
-      # Since the exceutebatch failed this should mean any events failed to be
-      # inserted will be re-run. We're going to log it for the lols anyway.
       log_jdbc_exception(e)
     ensure
-      connection.close();
+      statement.close() unless statement.nil?
+      connection.close() unless connection.nil?
     end
   end
 
   def unsafe_flush(events, teardown=false)
-    connection = @pool.getConnection()
+    connection = nil
+    statement = nil
+    begin
+      connection = @pool.getConnection()
 
-    events.each do |event|
-      next if event.cancelled?
-      
-      statement = connection.prepareStatement(event.sprintf(@statement[0]))
-      statement = add_statement_event_params(statement, event) if @statement.length > 1
+      events.each do |event|
+        next if event.cancelled?
+
+        statement = connection.prepareStatement(event.sprintf(@statement[0]))
+        statement = add_statement_event_params(statement, event) if @statement.length > 1
 
-      begin
         statement.execute()
-        
+
         # cancel the event, since we may end up outputting the same event multiple times
         # if an exception happens later down the line
         event.cancel
         @exceptions_tracker << nil
-      rescue => e
-        # Raising an exception will incur a retry from Stud::Buffer.
-        # We log for the lols.
-        log_jdbc_exception(e)
-      ensure
-        statement.close()
-        connection.close()
       end
+    rescue => e
+      log_jdbc_exception(e)
+    ensure
+      statement.close() unless statement.nil?
+      connection.close() unless connection.nil?
     end
   end
 

data/spec/outputs/jdbc_spec.rb

@@ -88,6 +88,7 @@ describe LogStash::Outputs::Jdbc do
       end
       stmt.close()
       c.close()
+
       expect(count).to be > 0
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6.rc1
 platform: ruby
 authors:
 - the_angry_angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -107,9 +107,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1