logstash-output-http 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0f8641077417db2ff06a2c110b1bd0db08ade0e
-  data.tar.gz: 1c0e81c71ec5058b354b76e8d6e895b0752c7f46
+  metadata.gz: f7bdce3a5a4b518dd65c7a99db5f3442540aa112
+  data.tar.gz: f5c6894d57ec7606344c6a74937a6d33da4420c7
 SHA512:
-  metadata.gz: f6fa16c1088eebbcf31f6570c889d5a99bea037cd80c1ee6e74d1b7aa3caca10d1441f6bcbc83ed6f857b1802f8220bed77964f7b47fbe7f75fa75610a36c3e7
-  data.tar.gz: 9565bfee79b50fb814ffbdd0ea735533070994d026033896f76b62ee5c1ccbf4fcab278a4b38cbd10dfcd94b1b3bc90137001ffb1f29d8cf3cebeef805dd66b4
+  metadata.gz: 4fbf0c5ea31c2fd8fa994f19f1a695ede4bd7eaa8ebd9ff098127ada67f929c99b06946200860ffaee04c55e8f3103ead44544b3c95fcd32587be7d01b306da3
+  data.tar.gz: bf4f3a9dd411f36211e55509a8400b3b538574b341d5e954c2ff451c93da171ce369eea756e1a0e9ad825b2badfb9d664bdbc518e78509f908d6fdde74944089

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-* 1.1.0
+## 1.1.1
+ - fixed memory leak
+ - fixed potential race condition on async callbacks
+
+## 1.1.0
   - Concurrent execution
   - Add many HTTP options via the http_client mixin
   - Switch to manticore as HTTP Client

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/outputs/http.rb

@@ -89,6 +89,8 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
     validate_format!
   end # def register
 
+  # TODO: (colin) the request call sequence + async handling will have to be reworked when using
+  # Maticore >= 5.0. I will set a version constrain in the gemspec for this.
   def receive(event)
     return unless output?(event)
 
@@ -102,13 +104,17 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
     headers = event_headers(event)
 
     # Create an async request
-    request = client.send(@http_method, url, body: body, headers: headers, async: true)
+    request = client.send(@http_method, url, :body => body, :headers => headers, :async => true)
 
-    # Invoke it using the Manticore Executor (CachedThreadPool) directly
-    request_async_background(request)
+    # with Maticore version < 0.5 using :async => true places the requests in an @async_requests
+    # list which is used & cleaned by Client#execute! but we are not using it here and we must
+    # purge it manually to avoid leaking requests.
+    client.clear_pending
+
+    # attach handlers before performing request
 
-    # Make sure we return the token to the pool
     request.on_complete do
+      # Make sure we return the token to the pool
       @request_tokens << token
     end
 
@@ -133,6 +139,9 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
                   :backtrace => exception.backtrace
       )
     end
+
+    # Invoke it using the Manticore Executor (CachedThreadPool) directly
+    request_async_background(request)
   end
 
   private

data/logstash-output-http.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-http'
-  s.version         = '1.1.0'
+  s.version         = '1.1.1'
   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/plugin install gemname. This gem is not a stand-alone program"
@@ -23,6 +23,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
   s.add_runtime_dependency 'logstash-mixin-http_client', '>= 1.0.1', '< 2.0.0'
 
+  # Constrain Maticore dependency to less than 0.5.0 because of changes in the async handling
+  # see note in http.rb
+  s.add_runtime_dependency "manticore", "< 0.5.0"
+
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'logstash-codec-plain'
   s.add_development_dependency 'sinatra'

metadata

@@ -1,17 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   name: logstash-core
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -20,18 +30,18 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.0.1
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  name: logstash-mixin-http_client
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-mixin-http_client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -40,72 +50,76 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - <
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.5.0
+  name: manticore
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - <
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   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-codec-plain
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: sinatra
   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: sinatra
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: webrick
   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: webrick
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
 email: info@elastic.co
 executables: []
@@ -145,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This output lets you `PUT` or `POST` events to a generic HTTP(S) endpoint