logstash-output-elasticsearch_java 2.0.0.beta9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2adf5a83677078a3f4f640e2b7154ea79438a8b
-  data.tar.gz: df41f4b1f4728a35a49251ad972a130e94bb3f0f
+  metadata.gz: 8203c181d7406272e4f3a539964c0f5403d2f1fc
+  data.tar.gz: 256f76da6ffa545b0c8c3680f8ceb5c64a6af5c2
 SHA512:
-  metadata.gz: 8c73c40a6b138c0f0db50452e4a7049249b3fd7cc00b5121437f0adad90b1c8f13812ab1bcad63e10fd2fc2df00f4c6bece8b666b89b83eea0da62490cc62b4f
-  data.tar.gz: 4de7038f19b596210d23ae61bc338f7ca8380e961b73a656c631102e046fdf9a21f5775737d21d7d8bc2c8a6e888a4c0bd0ab6789dd11bc8ddbb6230f369344a
+  metadata.gz: 4fcd1adadbe9a7c5720e84b9bcab3c040b507a306078b3c42783b89180c16c1a3d9ac6e13e9a677583c894b01412b5f46aa78d7e5ff03f4d978ec8e31773e34a
+  data.tar.gz: 29461bb180ca18236aa6cf6de5dcc15ab853ade4d540b9f39f3471f52f19a4c8cc60186963af53e63fa7dcaa802038770b704d3c0cced1590cdcb0a654d8ef7d

data/CHANGELOG.md

@@ -1,2 +1,7 @@
+## 2.0.0
+ - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+   instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
+ - Dependency on logstash-core update to 2.0
+
 ## 2.0.0
   - Initial Release. Only supports Node/Transport in ES2.x

data/lib/logstash/outputs/elasticsearch_java.rb

@@ -410,7 +410,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
 
   public
   def receive(event)
-    return unless output?(event)
+    
 
     # block until we have not maxed out our 
     # retry queue. This is applying back-pressure
@@ -481,11 +481,7 @@ class LogStash::Outputs::ElasticSearchJava < LogStash::Outputs::Base
   end # def flush
 
   public
-  def teardown
-    if @cacert # remove temporary jks store created from the cacert
-      File.delete(@truststore)
-    end
-
+  def close
     @retry_teardown_requested.make_true
     # First, make sure retry_timer_thread is stopped
     # to ensure we do not signal a retry based on 

data/logstash-output-elasticsearch_java.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch_java'
-  s.version         = '2.0.0.beta9'
+  s.version         = '2.0.0'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch using Java node/transport client"
   s.description     = "Output events to elasticsearch using the java client"
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'elasticsearch', ['>= 1.0.13', '~> 1.0']
   s.add_runtime_dependency 'stud', ['>= 0.0.17', '~> 0.0']
   s.add_runtime_dependency 'cabin', ['~> 0.6']
-  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
 
   s.add_development_dependency 'ftw', '~> 0.0.42'
   s.add_development_dependency 'logstash-input-generator'

data/spec/integration/outputs/retry_spec.rb

@@ -61,7 +61,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     end
     subject.register
     subject.receive(event1)
-    subject.teardown
+    subject.close
   end
 
   it "should retry actions with response status of 503" do
@@ -109,7 +109,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(invalid_event)
     expect(subject).not_to receive(:retry_push)
-    subject.teardown
+    subject.close
 
     @es.indices.refresh
     sleep(5)
@@ -123,7 +123,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(event1)
     expect(subject).not_to receive(:retry_push)
-    subject.teardown
+    subject.close
 
     @es.indices.refresh
     sleep(5)
@@ -137,7 +137,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.register
     subject.receive(invalid_event)
     subject.receive(event1)
-    subject.teardown
+    subject.close
     @es.indices.refresh
     sleep(5)
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch_java
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta9
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: concurrent-ruby
@@ -21,16 +21,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.13
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   name: elasticsearch
@@ -38,19 +38,19 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.13
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.17
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
   name: stud
@@ -58,16 +58,16 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.17
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   name: cabin
@@ -75,27 +75,33 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.snapshot
+        version: 2.0.0.beta2
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta2
+    - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0.snapshot
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
   name: ftw
@@ -103,13 +109,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-input-generator
@@ -117,13 +123,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -131,13 +137,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   name: longshoreman
@@ -145,7 +151,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Output events to elasticsearch using the java client
@@ -228,14 +234,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8
@@ -254,4 +260,3 @@ test_files:
 - spec/integration/outputs/update_spec.rb
 - spec/unit/outputs/elasticsearch/protocol_spec.rb
 - spec/unit/outputs/elasticsearch_spec.rb
-has_rdoc: