logstash-output-http 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7bdce3a5a4b518dd65c7a99db5f3442540aa112
-  data.tar.gz: f5c6894d57ec7606344c6a74937a6d33da4420c7
+  metadata.gz: aec5c4f25fa21f9b5e6448170409a27e2686836e
+  data.tar.gz: eb1398722a76eda6cd20e8624bc2825a6b811f3b
 SHA512:
-  metadata.gz: 4fbf0c5ea31c2fd8fa994f19f1a695ede4bd7eaa8ebd9ff098127ada67f929c99b06946200860ffaee04c55e8f3103ead44544b3c95fcd32587be7d01b306da3
-  data.tar.gz: bf4f3a9dd411f36211e55509a8400b3b538574b341d5e954c2ff451c93da171ce369eea756e1a0e9ad825b2badfb9d664bdbc518e78509f908d6fdde74944089
+  metadata.gz: d5b1b2ef55750bc9f9d241729f04f71c39b4eabce97739e3af68aa1f643bc2cb1a95921db6f8af1b23bcf76578669e390a1d45e91841c188e144b734de149316
+  data.tar.gz: 6204c7b3e9ccbfa2e51d92c1bca24cdd90e8242b968dbc8eea40e88555ca5c11524a33030db8e2f7c4bd7ebba4b66936e99a44d1c6dac3506f15820a09afb95d

data/CHANGELOG.md

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

data/lib/logstash/outputs/http.rb

@@ -89,8 +89,6 @@ 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)
 
@@ -104,17 +102,13 @@ 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)
 
-    # 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
+    # Invoke it using the Manticore Executor (CachedThreadPool) directly
+    request_async_background(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
 
@@ -139,9 +133,6 @@ 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.1'
+  s.version         = '2.0.0'
   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"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,13 +20,9 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
   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,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-09-23 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
+        version: 2.0.0.snapshot
   name: logstash-core
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -50,20 +44,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  name: manticore
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.5.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -126,14 +106,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/outputs/http.rb
 - logstash-output-http.gemspec
 - spec/outputs/http_spec.rb

data/.gitignore

@@ -1,6 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor
-.idea
-*~

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"