logstash-output-http 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd31e8b068801076f37ec2602c5a58a2f36cd534
-  data.tar.gz: 2116bfe2f7ebf9340a6bfd35cb57a39747c540ec
+  metadata.gz: 73a597250df181f829b48c449711b879e794e153
+  data.tar.gz: 2eefc03af59e7a6b19f821080c320c5877f06a5c
 SHA512:
-  metadata.gz: f642d0e46bc2b752d6d94c021a76b17af835c2a7789a4c91c66b96e332763cba54a9b8a1cb90e797421f351dc010129c4dcae1027e28776d1f7a14095abe53e2
-  data.tar.gz: bb0ecb8c1094047d37f4f85eded0cb89b7f67508953da3f563dfc78a5f5dcea27d4ba850daea464b98c4a4838cc41461e949873474fa099614056051a1880aea
+  metadata.gz: dd8587ee8375b620c39f817ac8cbb838f874698ed3bfb62bc33d31f75bfd1bcd48d42ddfac372648c491675bf0a971f9315771d2a4f654762772b678aa20aee8
+  data.tar.gz: 179ec4113a7cce26daab853ffec1b86c2012311475969a70c3f5e4a0ff20ce39f4f36cf00228d9da467d359a90b63e04a2407f538a2b3b4209797c1a19cfe7c9

data/CHANGELOG.md

@@ -1,5 +1,9 @@
+## 2.0.3
+ - fixed potential race condition on async callbacks
+ - silenced specs equest logs and other spec robustness fixes
+
 ## 2.0.0
- - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
+ - 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
 

data/lib/logstash/outputs/http.rb

@@ -90,8 +90,6 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
   end # def register
 
   def receive(event)
-    
-
     body = event_body(event)
 
     # Block waiting for a token
@@ -104,11 +102,10 @@ class LogStash::Outputs::Http < LogStash::Outputs::Base
     # Create an async request
     request = client.send(@http_method, url, body: body, headers: headers, async: true)
 
-    # Invoke it using the Manticore Executor (CachedThreadPool) directly
-    request_async_background(request)
+    # 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 +130,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         = '2.0.2'
+  s.version         = '2.0.3'
   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"

data/spec/outputs/http_spec.rb

@@ -10,7 +10,19 @@ class LogStash::Outputs::Http
   attr_reader :request_tokens
 end
 
+# note that Sinatra startup and shutdown messages are directly logged to stderr so
+# it is not really possible to disable them without reopening stderr which is not advisable.
+#
+# == Sinatra (v1.4.6) has taken the stage on 51572 for development with backup from WEBrick
+# == Sinatra has ended his set (crowd applauds)
+
 class TestApp < Sinatra::Base
+
+  # disable WEBrick logging
+  def self.server_settings
+    { :AccessLog => [], :Logger => WEBrick::BasicLog::new(nil, WEBrick::BasicLog::FATAL) }
+  end
+
   def self.multiroute(methods, path, &block)
     methods.each do |method|
       method.to_sym
@@ -41,16 +53,20 @@ RSpec.configure do |config|
   #http://stackoverflow.com/questions/6557079/start-and-call-ruby-http-server-in-the-same-script
   def sinatra_run_wait(app, opts)
     queue = Queue.new
-    thread = Thread.new do
-      Thread.abort_on_exception = true
-      app.run!(opts) do |server|
-        queue.push("started")
+
+    Thread.new(queue) do |queue|
+      begin
+        app.run!(opts) do |server|
+          queue.push("started")
+        end
+      rescue
+        # ignore
       end
     end
+
     queue.pop # blocks until the run! callback runs
   end
 
-
   config.before(:suite) do
     sinatra_run_wait(TestApp, :port => PORT, :server => 'webrick')
   end
@@ -62,6 +78,7 @@ describe LogStash::Outputs::Http do
   def wait_for_request
 
     loop do
+      sleep(0.1)
       break if subject.request_tokens.size > 0
     end
   end

metadata

@@ -1,16 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-http
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.snapshot
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -19,18 +28,18 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-core
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-mixin-http_client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.snapshot
+        version: 2.0.2
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,88 +48,79 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: logstash-mixin-http_client
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
+        version: '0'
   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: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/logstash/outputs/http.rb
+- spec/outputs/http_spec.rb
+- logstash-output-http.gemspec
 - CHANGELOG.md
+- README.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
-- README.md
-- lib/logstash/outputs/http.rb
-- logstash-output-http.gemspec
-- spec/outputs/http_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: This output lets you `PUT` or `POST` events to a generic HTTP(S) endpoint