logstash-output-http 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eff15e578da1bbd9f5042e6b0160f94b7a9f737d
-  data.tar.gz: 561c1e43cd01d98ccbb802f0ddaf4b50785a5e04
+  metadata.gz: 6df83fa177f09b440bb4e03b9ad402e8eeb98680
+  data.tar.gz: 3cb46bea5343b9c3ff438e9102232f44951daf67
 SHA512:
-  metadata.gz: 47beec9456073365a69cec26abeb9cf1d8b2647d7b0154d355830bb188e0cdceef3c3ef1c7191004a99512999decd11d6c0525efc42add9a827b3a15280d0e18
-  data.tar.gz: 4f4593aa0df0d5c93481152235544c4b70f8f20bb720bb70e89704755374f57c1e01a30b32464a3e47ec2046374c97c89cac39ab0d2ce260a84039a72356cf70
+  metadata.gz: ef1bfbccef08f56036dde52cefcea70771fc652d42573bc160dfa3add450802d33a3e8eb20d62a6962ffd430fe8272ff0abf8c7f1a097e8f5c111f27d0f44d21
+  data.tar.gz: b1e85549afb877f308ec55300a205083d9be5c70cb969df917a5d30868e84e73bc11058723654d18e38e2fbdb15f14725b2b31d294a419cbb16a14d5c6e46675

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.3.1
+ - Fix deadlock that could occur in certain situations. All users should upgrade to the latest version.
+   This deadlock was caused by certain async HTTP APIs being called out of order thus creating a race.
+
 ## 4.3.0
  - Add `user` and `password` options to support HTTP basic auth
  

data/docs/index.asciidoc

@@ -12,16 +12,12 @@ START - GENERATED VARIABLES, DO NOT EDIT!
 END - GENERATED VARIABLES, DO NOT EDIT!
 ///////////////////////////////////////////
 
-[id="plugins-{type}-{plugin}"]
+[id="plugins-{type}s-{plugin}"]
 
 === Http output plugin
 
 include::{include_path}/plugin_header.asciidoc[]
 
-==== Description
-
-
-
 [id="plugins-{type}s-{plugin}-options"]
 ==== Http Output Configuration Options
 
@@ -378,4 +374,4 @@ See https://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/org/apache
 
 
 [id="plugins-{type}s-{plugin}-common-options"]
-include::{include_path}/{type}.asciidoc[]
+include::{include_path}/{type}.asciidoc[]

data/lib/logstash/outputs/http.rb

@@ -198,7 +198,6 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
 
     # Create an async request
     request = client.background.send(@http_method, url, :body => body, :headers => headers)
-    request.call # Actually invoke the request in the background
 
     request.on_success do |response|
       begin
@@ -256,6 +255,11 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
           :backtrace => e.backtrace)
         end
     end
+
+    # Actually invoke the request in the background
+    # Note: this must only be invoked after all handlers are defined, otherwise
+    # those handlers are not guaranteed to be called!
+    request.call 
   end
 
   def close
@@ -284,15 +288,6 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
     @logger.error("[HTTP Output Failure] #{message}", opts)
   end
 
-  # Manticore doesn't provide a way to attach handlers to background or async requests well
-  # It wants you to use futures. The #async method kinda works but expects single thread batches
-  # and background only returns futures.
-  # Proposed fix to manticore here: https://github.com/cheald/manticore/issues/32
-  def request_async_background(request)
-    @method ||= client.executor.java_method(:submit, [java.util.concurrent.Callable.java_class])
-    @method.call(request)
-  end
-
   # Format the HTTP body
   def event_body(event)
     # TODO: Create an HTTP post data codec, use that here

data/logstash-output-http.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-http'
-  s.version         = '4.3.1'
+  s.version         = '4.3.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output lets you `PUT` or `POST` events to a generic HTTP(S) endpoint"
   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 gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement