logstash-input-lumberjack 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1664191f642e3ec99ffaf6ea16b2e8c393086c21
-  data.tar.gz: f14d9f60a969be2aab33ecd660782498dea00e4d
+  metadata.gz: 13d047624d0d97f3184fec85ee0d5a3f9a1fd274
+  data.tar.gz: 82d47b698574bd27368c49237c61e67c4bfcd5f7
 SHA512:
-  metadata.gz: 6ad436036dbc30d5cb3caaf5403604cfe04683b517d80beeb23e9c1d709ed23678f9a851e716285d6705459caf87f5f25c8311f0d74ae4cb078fd577ba97690f
-  data.tar.gz: 8db8d3b80dbd2e246ec47e720ffd868793207d89d57d97f61c47b42ace1d5416f0dec5e5760227250002dc52ff41eda18f56ea8b265f56f353d801eed1e060ec
+  metadata.gz: a8109970459a4c12f5ee11feb4b0aa12c668da8f840e9ca371e7f448da447993894964bfb1f2310c8766d7e8dd304bf0b30c088a947ecef21745a51d3caf44f9
+  data.tar.gz: 731c6a93b576bc7d221a9aaa66ee965ba12e3be7fe4d1182468195aaa9fb93483d071e136fc004326487af2a03141909981ef17ac2341cc459e82a92aa2b8a27

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.3
+  - Fix `concurrent-ruby` deprecation warning (https://github.com/logstash-plugins/logstash-input-lumberjack/pull/39)
+  - Remove deplicate declaration of the threadpool
+  - Force `ruby-lumberjack` to be version 0.0.23 or higher to be in sync with `logstash-output-lumberjack`
 # 1.0.2
   - Use a `require_relative` for loading the spec helpers. (https://github.com/logstash-plugins/logstash-input-lumberjack/pull/35)
 # 1.0.1

data/lib/logstash/inputs/lumberjack.rb

@@ -29,12 +29,8 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
   # SSL key passphrase to use.
   config :ssl_key_passphrase, :validate => :password
 
-  # The lumberjack input using a fixed thread pool to do the actual work and
-  # will accept a number of client in a queue, before starting to refuse new
-  # connection. This solve an issue when logstash-forwarder clients are 
-  # trying to connect to logstash which have a blocked pipeline and will 
-  # make logstash crash with an out of memory exception.
-  config :max_clients, :validate => :number, :default => 1000
+  # This setting no longer has any effect and will be removed in a future release.
+  config :max_clients, :validate => :number, :deprecated => "This setting no longer has any effect. See https://github.com/logstash-plugins/logstash-input-lumberjack/pull/12 for the history of this change"
 
   # TODO(sissel): Add CA to authenticate clients with.
 
@@ -52,16 +48,9 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
       :ssl_certificate => @ssl_certificate, :ssl_key => @ssl_key,
       :ssl_key_passphrase => @ssl_key_passphrase)
 
-    # Limit the number of thread that can be created by the
-    # Limit the number of thread that can be created by the 
-    # lumberjack output, if the queue is full the input will 
-    # start rejecting new connection and raise an exception
-    @threadpool = Concurrent::ThreadPoolExecutor.new(
-      :min_threads => 1,
-      :max_threads => @max_clients,
-      :max_queue => 1, # in concurrent-ruby, bounded queue need to be at least 1.
-      fallback_policy: :abort
-    )
+    # Create a reusable threadpool, we do not limit the number of connections
+    # to the input, the circuit breaker with the timeout should take care 
+    # of `blocked` threads and prevent logstash to go oom.
     @threadpool = Concurrent::CachedThreadPool.new(:idletime => 15)
 
     # in 1.5 the main SizeQueue doesnt have the concept of timeout

data/lib/logstash/sized_queue_timeout.rb

@@ -1,5 +1,5 @@
-require "concurrent/atomic/condition"
 require "thread"
+require "concurrent"
 
 module LogStash
   # Minimal subset implement of a SizedQueue supporting
@@ -12,8 +12,11 @@ module LogStash
     DEFAULT_TIMEOUT = 2 # in seconds
 
     def initialize(max_size, options = {})
-      @condition_in = Concurrent::Condition.new
-      @condition_out = Concurrent::Condition.new
+      # `concurrent-ruby` are deprecating the `Condition`
+      # in favor of a Synchonization class that you need to implement.
+      # this was bit overkill to only check if the wait did a timeout.
+      @condition_in = ConditionVariable.new
+      @condition_out = ConditionVariable.new
 
       @max_size = max_size
       @queue = []
@@ -23,8 +26,11 @@ module LogStash
     def push(obj, timeout = DEFAULT_TIMEOUT)
       @mutex.synchronize do
         while full? # wake up check
-          result = @condition_out.wait(@mutex, timeout) 
-          raise TimeoutError if result.timed_out?
+          start_time = Concurrent.monotonic_time
+          @condition_out.wait(@mutex, timeout) 
+          if start_time + timeout - Concurrent.monotonic_time  < 0
+            raise TimeoutError
+          end
         end
 
         @queue << obj

data/logstash-input-lumberjack.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-lumberjack'
-  s.version         = '1.0.2'
+  s.version         = '1.0.3'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Receive events using the lumberjack protocol."
   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,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
 
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'jls-lumberjack', ['>=0.0.20']
+  s.add_runtime_dependency 'jls-lumberjack', ['>=0.0.23']
   s.add_runtime_dependency "concurrent-ruby"
 
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-lumberjack
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -50,12 +50,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.23
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.20
+        version: 0.0.23
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency