logstash-core 2.1.0.snapshot4-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060e88f92b12571dce771d6f79494fb5a982e0b7
-  data.tar.gz: b56181ebc53dddb35bfbf629b7e9891bcb38b63a
+  metadata.gz: 1bb29b50e2fba0030dab2533db69c588b53b18d3
+  data.tar.gz: 2a3469ff4b22cdc42bc0cd2eadf65e55eecbd2f6
 SHA512:
-  metadata.gz: 463294e89e3d9d3f2164fe5bf38e58cdbce6aec59fe6510c1f57931c0251705badf714397ec3f4e6cab0c35c34df4cc5abb5649b04c5e0bf6c1509597561d962
-  data.tar.gz: 2ae3e29871df8c2da16925c22cb279009439b2c9bcff529ab7bed215bc5027d00ff329aeabcff9c20f423b8eecbbc0c72d2fa9b08b88551e4f043a638c65177a
+  metadata.gz: 19af0d42ad2f1288da6a080a1a923306a29e3c0780b32d05b3f6e845c184addcbf43cb20a2d6e6ca0fc8c82bcc3b7a0d7d8fc9e38194b7cba84df693570e9177
+  data.tar.gz: befcd1db23db37bd5cefe59d0c8451c45bed70b7c9f59772f390b063d693a700245f0470c9de38dd277320c6437791a852d57ea25f9af50a2fdbebf40dc36082

data/lib/logstash/pipeline.rb

@@ -53,6 +53,7 @@ module LogStash; class Pipeline
     # @ready requires thread safety since it is typically polled from outside the pipeline thread
     @ready = Concurrent::AtomicBoolean.new(false)
     @input_threads = []
+    @filter_threads = []
   end # def initialize
 
   def ready?
@@ -136,7 +137,7 @@ module LogStash; class Pipeline
   end
 
   def wait_filters
-    @filter_threads.each(&:join) if @filter_threads
+    @filter_threads.each(&:join)
   end
 
   def shutdown_outputs

data/lib/logstash/version.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # The version of logstash.
-LOGSTASH_VERSION = "2.1.0.snapshot4"
+LOGSTASH_VERSION = "2.1.1"
 
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.

data/spec/core/pipeline_spec.rb

@@ -299,4 +299,27 @@ describe LogStash::Pipeline do
       end
     end
   end
+
+  describe "stalling_threads" do
+    before(:each) do
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummyinput").and_return(DummyInput)
+      allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(DummyCodec)
+      allow(LogStash::Plugin).to receive(:lookup).with("output", "dummyoutput").and_return(DummyOutput)
+    end
+
+    context "when the pipeline doesn't have filters" do
+      let(:pipeline_with_no_filters) do
+        <<-eos
+        input { dummyinput {} }
+        output { dummyoutput {} }
+        eos
+      end
+
+      it "doesn't raise an error" do
+        pipeline = TestPipeline.new(pipeline_with_no_filters)
+        pipeline.run
+        expect { pipeline.stalling_threads }.to_not raise_error
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0.snapshot4
+  version: 2.1.1
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -324,9 +324,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.5