logstash-core 2.0.0.beta1-java → 2.0.0.beta2-java

data/spec/license_spec.rb

@@ -16,6 +16,18 @@ describe "Project licenses" do
                    /lgpl/])
   }
 
+  ##
+  # This licenses are skipped from the license test of many reasons, check
+  # the exact dependency for detailed information.
+  ##
+  let(:skipped_dependencies) do
+    [
+      # Skipped because of already included and bundled within JRuby so checking here is redundant.
+      # Need to take action about jruby licenses to enable again or keep skeeping.
+      "jruby-openssl"
+    ]
+  end
+
   shared_examples "runtime license test" do
 
     subject(:gem_name) do |example|
@@ -33,6 +45,7 @@ describe "Project licenses" do
     it "has runtime dependencies with expected licenses" do
       spec.runtime_dependencies.map { |dep| dep.to_spec }.each do |runtime_spec|
         next unless runtime_spec
+        next if skipped_dependencies.include?(runtime_spec.name)
         runtime_spec.licenses.each do |license|
           expect(license.downcase).to match(expected_licenses)
         end

data/spec/outputs/base_spec.rb

@@ -24,24 +24,3 @@ describe "LogStash::Outputs::Base#worker_setup" do
     output.worker_setup
   end
 end
-
-describe "LogStash::Outputs::Base#output?" do
-  it "should filter by type" do
-    output = LogStash::Outputs::NOOP.new("type" => "noop")
-    expect(output.receive(LogStash::Event.new({"type" => "noop"}))).to eq(true)
-    expect(output.receive(LogStash::Event.new({"type" => "not_noop"}))).to eq(false)
-  end
-  
-  it "should filter by tags" do
-    output = LogStash::Outputs::NOOP.new("tags" => ["value", "value2"])
-    expect(output.receive(LogStash::Event.new({"tags" => ["value","value2"]}))).to eq(true)
-    expect(output.receive(LogStash::Event.new({"tags" => ["notvalue"]}))).to eq(false)
-    expect(output.receive(LogStash::Event.new({"tags" => ["value"]}))).to eq(false)
-  end
-
-  it "should exclude by tags" do
-    output = LogStash::Outputs::NOOP.new("exclude_tags" => ["value"])
-    expect(output.receive(LogStash::Event.new({"tags" => ["value"]}))).to eq(false)
-    expect(output.receive(LogStash::Event.new({"tags" => ["notvalue"]}))).to eq(true)
-  end
-end

data/spec/util/defaults_printer_spec.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/defaults_printer"
+
+describe LogStash::Util::DefaultsPrinter do
+  shared_examples "a defaults printer" do
+    it 'the .print method returns a defaults description' do
+      expect(actual_block.call).to eq(expected)
+    end
+  end
+
+  let(:workers)  { 1 }
+  let(:expected) { "Default settings used: Filter workers: #{workers}" }
+  let(:settings) { {} }
+
+  describe 'class methods API' do
+    let(:actual_block) do
+      -> {described_class.print(settings)}
+    end
+
+    context 'when the settings hash is empty' do
+      it_behaves_like "a defaults printer"
+    end
+
+    context 'when the settings hash has content' do
+      let(:workers) { 42 }
+      let(:settings) { {'filter-workers' => workers} }
+
+      it_behaves_like "a defaults printer"
+    end
+  end
+
+  describe 'instance method API' do
+    let(:actual_block) do
+      -> {described_class.new(settings).print}
+    end
+
+    context 'when the settings hash is empty' do
+      it_behaves_like "a defaults printer"
+    end
+
+    context 'when the settings hash has content' do
+      let(:workers) { 13 }
+      let(:settings) { {'filter-workers' => workers} }
+
+      it_behaves_like "a defaults printer"
+    end
+  end
+end

data/spec/util/worker_threads_default_printer_spec.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/worker_threads_default_printer"
+
+describe LogStash::Util::WorkerThreadsDefaultPrinter do
+  let(:settings) { {} }
+  let(:collector) { [] }
+
+  subject { described_class.new(settings) }
+
+  context 'when the settings hash is empty' do
+    it 'the #visit method returns a string with 1 filter worker' do
+      subject.visit(collector)
+      expect(collector.first).to eq("Filter workers: 1")
+    end
+  end
+
+  context 'when the settings hash has content' do
+    let(:settings) { {'filter-workers' => 42} }
+
+    it 'the #visit method returns a string with 42 filter workers' do
+      subject.visit(collector)
+      expect(collector.first).to eq("Filter workers: 42")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -96,6 +96,34 @@ dependencies:
         version: 0.8.3
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.11
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: treetop
   version_requirements: !ruby/object:Gem::Requirement
@@ -158,12 +186,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 0.3.5
   prerelease: false
   type: :runtime
 description: The core components of logstash, the scalable log and event management tool
@@ -179,6 +207,8 @@ files:
 - lib/logstash/agent.rb
 - lib/logstash/codecs/base.rb
 - lib/logstash/config/config_ast.rb
+- lib/logstash/config/cpu_core_strategy.rb
+- lib/logstash/config/defaults.rb
 - lib/logstash/config/file.rb
 - lib/logstash/config/grammar.rb
 - lib/logstash/config/mixin.rb
@@ -192,7 +222,6 @@ files:
 - lib/logstash/java_integration.rb
 - lib/logstash/json.rb
 - lib/logstash/logging.rb
-- lib/logstash/multiqueue.rb
 - lib/logstash/namespace.rb
 - lib/logstash/outputs/base.rb
 - lib/logstash/patches.rb
@@ -201,6 +230,7 @@ files:
 - lib/logstash/patches/cabin.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/rubygems.rb
+- lib/logstash/patches/silence_concurrent_ruby_warning.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/plugin.rb
@@ -214,20 +244,23 @@ files:
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/charset.rb
 - lib/logstash/util/decorators.rb
+- lib/logstash/util/defaults_printer.rb
 - lib/logstash/util/filetools.rb
 - lib/logstash/util/java_version.rb
 - lib/logstash/util/password.rb
 - lib/logstash/util/plugin_version.rb
 - lib/logstash/util/prctl.rb
 - lib/logstash/util/reporter.rb
-- lib/logstash/util/require-helper.rb
 - lib/logstash/util/retryable.rb
 - lib/logstash/util/socket_peer.rb
 - lib/logstash/util/unicode_trimmer.rb
+- lib/logstash/util/worker_threads_default_printer.rb
 - lib/logstash/version.rb
 - locales/en.yml
 - logstash-core.gemspec
 - spec/core/conditionals_spec.rb
+- spec/core/config_cpu_core_strategy_spec.rb
+- spec/core/config_defaults_spec.rb
 - spec/core/config_mixin_spec.rb
 - spec/core/config_spec.rb
 - spec/core/environment_spec.rb
@@ -249,11 +282,13 @@ files:
 - spec/spec_helper.rb
 - spec/util/accessors_spec.rb
 - spec/util/charset_spec.rb
+- spec/util/defaults_printer_spec.rb
 - spec/util/gemfile_spec.rb
 - spec/util/java_version_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
 - spec/util/unicode_trimmer_spec.rb
+- spec/util/worker_threads_default_printer_spec.rb
 - spec/util_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
@@ -275,12 +310,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: logstash-core - The core components of logstash
 test_files:
 - spec/core/conditionals_spec.rb
+- spec/core/config_cpu_core_strategy_spec.rb
+- spec/core/config_defaults_spec.rb
 - spec/core/config_mixin_spec.rb
 - spec/core/config_spec.rb
 - spec/core/environment_spec.rb
@@ -302,9 +339,11 @@ test_files:
 - spec/spec_helper.rb
 - spec/util/accessors_spec.rb
 - spec/util/charset_spec.rb
+- spec/util/defaults_printer_spec.rb
 - spec/util/gemfile_spec.rb
 - spec/util/java_version_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
 - spec/util/unicode_trimmer_spec.rb
+- spec/util/worker_threads_default_printer_spec.rb
 - spec/util_spec.rb

data/lib/logstash/multiqueue.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-require "logstash/namespace"
-require "cabin"
-
-class LogStash::MultiQueue
-  attr_accessor :logger
-
-  public
-  def initialize(*queues)
-    @logger = Cabin::Channel.get(LogStash)
-    @mutex = Mutex.new
-    @queues = queues
-  end # def initialize
-
-  public
-  def logger=(_logger)
-    @logger = _logger
-
-    # Set the logger for all known queues, too.
-    @queues.each do |q|
-      q.logger = _logger
-    end
-  end # def logger=
-
-  # Push an object to all queues.
-  public
-  def push(object)
-    @queues.each { |q| q.push(object) }
-  end # def push
-  alias :<< :push
-
-  alias_method :<<, :push
-
-  # Add a new Queue to this queue.
-  public
-  def add_queue(queue)
-    @mutex.synchronize do
-      @queues << queue
-    end
-  end # def add_queue
-
-  public
-  def remove_queue(queue)
-    @mutex.synchronize do
-      @queues.delete(queue)
-    end
-  end # def remove_queue
-
-  public
-  def size
-    return @queues.collect { |q| q.size }
-  end # def size
-end # class LogStash::MultiQueue

data/lib/logstash/util/require-helper.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-require "logstash/namespace"
-require "logstash/logging"
-
-module LogStash::Util::Require
-  class << self
-    attr_accessor :logger
-
-    def require(lib, gemdep, message=nil)
-      @logger ||= LogStash::Logger.new(STDERR)
-      begin
-        require lib
-      rescue LoadError => e
-        @logger.error("Failed loading '#{lib}'")
-      end
-    end # def require
-  end # class << self
-end # def LogStash::Util::Require