logstash 6.3.2

Author: seko0716

.gitignore

@@ -2,11 +2,4 @@
 Gemfile.lock
 Gemfile.bak
 .bundle
-.vagrant
-.mvn
-vendor
-lib/**/*.jar
 
-.DS_Store
-*.swp
-*.log

Gemfile

@@ -1,2 +1,11 @@
 source 'https://rubygems.org'
+
 gemspec
+
+logstash_path = ENV["LOGSTASH_PATH"] || "../../logstash"
+use_logstash_source = ENV["LOGSTASH_SOURCE"] && ENV["LOGSTASH_SOURCE"].to_s == "1"
+
+if Dir.exist?(logstash_path) && use_logstash_source
+  gem 'logstash-core', :path => "#{logstash_path}/logstash-core"
+  gem 'logstash-core-plugin-api', :path => "#{logstash_path}/logstash-core-plugin-api"
+end

lib/logstash/outputs/jdbc.rb

@@ -19,19 +19,19 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   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
+      # 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'
@@ -81,7 +81,7 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   # Maximum time between retries, in seconds
   config :retry_max_interval, validate: :number, default: 128
 
-  # Any additional custom, retryable SQL state codes. 
+  # Any additional custom, retryable SQL state codes.
   # Suitable for configuring retryable custom JDBC SQL state codes.
   config :retry_sql_states, validate: :array, default: []
 
@@ -100,10 +100,10 @@ class LogStash::Outputs::Jdbc < LogStash::Outputs::Base
   config :max_repeat_exceptions, obsolete: 'This has been replaced by max_flush_exceptions - which behaves slightly differently. Please check the documentation.'
   config :max_repeat_exceptions_time, obsolete: 'This is no longer required'
   config :idle_flush_time, obsolete: 'No longer necessary under Logstash v5'
-  
+
   # Allows the whole event to be converted to JSON
   config :enable_event_as_json_keyword, validate: :boolean, default: false
-  
+
   # The magic key used to convert the whole event to JSON. If you need this, and you have the default in your events, you can use this to change your magic keyword.
   config :event_as_json_keyword, validate: :string, default: '@event'
 
@@ -217,7 +217,7 @@ def submit(events)
     events.each do |event|
       begin
         statement = connection.prepareStatement(
-          (@unsafe_statement == true) ? event.sprintf(@statement[0]) : @statement[0]
+            (@unsafe_statement == true) ? event.sprintf(@statement[0]) : @statement[0]
         )
         statement = add_statement_event_params(statement, event) if @statement.length > 1
         statement.execute
@@ -326,8 +326,8 @@ def retry_exception?(exception, event)
 
   def log_jdbc_exception(exception, retrying, event)
     current_exception = exception
-    log_text = 'JDBC - Exception. ' + (retrying ? 'Retrying' : 'Not retrying') 
-    
+    log_text = 'JDBC - Exception. ' + (retrying ? 'Retrying' : 'Not retrying')
+
     log_method = (retrying ? 'warn' : 'error')
 
     loop do

logstash-output-jdbc.gemspec

@@ -4,35 +4,29 @@ Gem::Specification.new do |s|
   s.licenses = ['Apache License (2.0)']
   s.summary = 'This plugin allows you to output to SQL, via JDBC'
   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 'logstash-output-jdbc'. This gem is not a stand-alone program"
-  s.authors = ['the_angry_angel']
-  s.email = '[email protected]'
-  s.homepage = 'https://github.com/theangryangel/logstash-output-jdbc'
-  s.require_paths = ['lib']
-
-  # Java only
-  s.platform = 'java'
+  s.authors = ["the_angry_angel"]
+  s.email = "[email protected]"
+  s.homepage = "https://github.com/theangryangel/logstash-output-jdbc"
+  s.require_paths = ["lib", "vendor"]
 
   # Files
-  s.files = Dir.glob('{lib,spec}/**/*.rb') + Dir.glob('vendor/**/*') + %w(LICENSE.txt README.md)
-
-  # Tests
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
+   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   # Special flag to let us know this is actually a logstash plugin
-  s.metadata = { 'logstash_plugin' => 'true', 'logstash_group' => 'output' }
+  s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency 'logstash-core-plugin-api', '~> 2'
-  s.add_runtime_dependency 'stud'
-  s.add_runtime_dependency 'logstash-codec-plain'
+  #
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
+  s.add_runtime_dependency "logstash-codec-plain"
+  s.add_development_dependency 'logstash-devutils'
 
   s.requirements << "jar 'com.zaxxer:HikariCP', '2.7.2'"
   s.requirements << "jar 'org.apache.logging.log4j:log4j-slf4j-impl', '2.6.2'"
 
   s.add_development_dependency 'jar-dependencies'
   s.add_development_dependency 'ruby-maven', '~> 3.3'
-
-  s.add_development_dependency "logstash-devutils", "~> 1.3", ">= 1.3.1"
-
   s.add_development_dependency 'rubocop', '0.41.2'
 end