logstash-core 5.0.0.alpha5.snapshot1-java → 5.0.0.alpha6.snapshot1-java

data/spec/logstash/util/wrapped_synchronous_queue_spec.rb

@@ -49,6 +49,12 @@ describe LogStash::Util::WrappedSynchronousQueue do
         let(:queue) { DummyQueue.new }
         let(:write_client) { LogStash::Util::WrappedSynchronousQueue::WriteClient.new(queue)}
         let(:read_client)  { LogStash::Util::WrappedSynchronousQueue::ReadClient.new(queue)}
+
+        before :each do
+          read_client.set_events_metric(LogStash::Instrument::NullMetric.new)
+          read_client.set_pipeline_metric(LogStash::Instrument::NullMetric.new)
+        end
+
         it "appends batches to the queue" do
           batch = write_client.get_new_batch
           5.times {|i| batch.push("value-#{i}")}

data/spec/logstash/webserver_spec.rb

@@ -0,0 +1,95 @@
+# encoding: utf-8
+# require "logstash/json"
+require "logstash/webserver"
+require "socket"
+require "spec_helper"
+require "open-uri"
+
+def block_ports(range)
+  servers = []
+
+  range.each do |port|
+    server = TCPServer.new("localhost", port)
+    Thread.new do
+      client = server.accept rescue nil
+    end
+    servers << server
+  end
+
+  sleep(1)
+  servers
+end
+
+def free_ports(servers)
+  servers.each do |t|
+    t.close rescue nil # the threads are blocked just kill
+  end
+end
+
+describe LogStash::WebServer do
+  before :all do
+    @abort = Thread.abort_on_exception
+    Thread.abort_on_exception = true
+  end
+
+  after :all do
+    Thread.abort_on_exception = @abort
+  end
+
+  let(:logger) { double("logger") }
+  let(:agent) { double("agent") }
+  let(:webserver) { double("webserver") }
+
+  before :each do
+    [:info, :warn, :error, :fatal, :debug].each do |level|
+      allow(logger).to receive(level)
+    end
+    [:info?, :warn?, :error?, :fatal?, :debug?].each do |level|
+      allow(logger).to receive(level)
+    end
+
+    allow(webserver).to receive(:address).and_return("127.0.0.1")
+    allow(agent).to receive(:webserver).and_return(webserver)
+  end
+
+  context "when the port is already in use and a range is provided" do
+    subject { LogStash::WebServer.new(logger,
+                                      agent,
+                                      { :http_host => "localhost", :http_ports => port_range
+                                      })}
+
+    let(:port_range) { 10000..10010 }
+    after(:each) { free_ports(@servers) }
+
+    context "when we have available ports" do
+      before(:each) do
+        @servers = block_ports(10000..10005)
+      end
+
+      it "successfully find an available port" do
+        t = Thread.new do
+          subject.run
+        end
+
+        sleep(1)
+
+        response = open("http://localhost:10006").read
+        expect { LogStash::Json.load(response) }.not_to raise_error
+        expect(subject.address).to eq("localhost:10006")
+
+        subject.stop
+        t.kill rescue nil
+      end
+    end
+
+    context "when all the ports are taken" do
+      before(:each) do
+        @servers = block_ports(port_range)
+      end
+
+      it "raise an exception" do
+        expect { subject.run }.to raise_error(Errno::EADDRINUSE, /Logstash tried to bind to port range/)
+      end
+    end
+  end
+end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.0.0.alpha5.snapshot1
+  version: 5.0.0.alpha6.snapshot1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha5.snapshot1
+        version: 5.0.0.alpha6.snapshot1
   name: logstash-core-event-java
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.alpha5.snapshot1
+        version: 5.0.0.alpha6.snapshot1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -273,7 +273,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
   name: jrjackson
   prerelease: false
   type: :runtime
@@ -281,7 +281,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 0.4.0
 description: The core components of logstash, the scalable log and event management tool
 email:
 - info@elastic.co
@@ -349,6 +349,10 @@ files:
 - lib/logstash/logging/json.rb
 - lib/logstash/namespace.rb
 - lib/logstash/output_delegator.rb
+- lib/logstash/output_delegator_strategies/legacy.rb
+- lib/logstash/output_delegator_strategies/shared.rb
+- lib/logstash/output_delegator_strategies/single.rb
+- lib/logstash/output_delegator_strategy_registry.rb
 - lib/logstash/outputs/base.rb
 - lib/logstash/patches.rb
 - lib/logstash/patches/bugfix_jruby_2558.rb
@@ -398,6 +402,7 @@ files:
 - spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/codecs/base_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
@@ -427,6 +432,9 @@ files:
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/integer_spec.rb
+- spec/logstash/settings/numeric_spec.rb
+- spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
@@ -438,6 +446,7 @@ files:
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
+- spec/logstash/webserver_spec.rb
 - spec/static/i18n_spec.rb
 - spec/support/matchers.rb
 - spec/support/mocks_classes.rb
@@ -478,6 +487,7 @@ test_files:
 - spec/api/spec_helper.rb
 - spec/conditionals_spec.rb
 - spec/logstash/agent_spec.rb
+- spec/logstash/codecs/base_spec.rb
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
@@ -507,6 +517,9 @@ test_files:
 - spec/logstash/plugins/registry_spec.rb
 - spec/logstash/runner_spec.rb
 - spec/logstash/setting_spec.rb
+- spec/logstash/settings/integer_spec.rb
+- spec/logstash/settings/numeric_spec.rb
+- spec/logstash/settings/port_range_spec.rb
 - spec/logstash/settings/string_spec.rb
 - spec/logstash/settings_spec.rb
 - spec/logstash/shutdown_watcher_spec.rb
@@ -518,6 +531,7 @@ test_files:
 - spec/logstash/util/unicode_trimmer_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
+- spec/logstash/webserver_spec.rb
 - spec/static/i18n_spec.rb
 - spec/support/matchers.rb
 - spec/support/mocks_classes.rb