logstash-core 2.2.4.snapshot2-java → 2.3.0-java

data/spec/logstash/json_spec.rb

@@ -18,6 +18,9 @@ describe "LogStash::Json" do
   let(:multi) {
     [
       {:ruby => "foo bar baz", :json => "\"foo bar baz\""},
+      {:ruby => "foo   ", :json => "\"foo   \""},
+      {:ruby => " ", :json => "\" \""},
+      {:ruby => "   ", :json => "\"   \""},
       {:ruby => "1", :json => "\"1\""},
       {:ruby => {"a" => true}, :json => "{\"a\":true}"},
       {:ruby => {"a" => nil}, :json => "{\"a\":null}"},
@@ -93,4 +96,16 @@ describe "LogStash::Json" do
   it "should raise Json::ParserError on invalid json" do
     expect{LogStash::Json.load("abc")}.to raise_error LogStash::Json::ParserError
   end
+
+  it "should return nil on empty string" do
+    o = LogStash::Json.load("")
+    expect(o).to be_nil
+  end
+
+  it "should return nil on blank string" do
+    o = LogStash::Json.load(" ")
+    expect(o).to be_nil
+    o = LogStash::Json.load("  ")
+    expect(o).to be_nil
+  end
 end

data/spec/logstash/pipeline_spec.rb

@@ -209,7 +209,7 @@ describe LogStash::Pipeline do
         pipeline.run
 
         expect(pipeline.outputs.size ).to eq(1)
-        expect(pipeline.outputs.first.workers.size ).to eq(pipeline.default_output_workers)
+        expect(pipeline.outputs.first.workers.size ).to eq(::LogStash::Pipeline::DEFAULT_OUTPUT_WORKERS)
         expect(pipeline.outputs.first.workers.first.num_closes ).to eq(1)
       end
 
@@ -416,7 +416,7 @@ describe LogStash::Pipeline do
       Thread.new { pipeline.run }
       sleep 0.1 while !pipeline.ready?
       # give us a bit of time to flush the events
-      wait(15).for do
+      wait(5).for do
         next unless output && output.events && output.events.first
         output.events.first["message"].split("\n").count
       end.to eq(number_of_events)

data/spec/logstash/plugin_spec.rb

@@ -111,7 +111,7 @@ describe LogStash::Plugin do
 
 
     it 'logs a warning if the plugin use the milestone option' do
-      expect_any_instance_of(Cabin::Channel).to receive(:warn)
+      expect_any_instance_of(Cabin::Channel).to receive(:debug)
         .with(/stromae plugin is using the 'milestone' method/)
 
       class LogStash::Filters::Stromae < LogStash::Filters::Base

data/spec/logstash/runner_spec.rb

@@ -10,6 +10,13 @@ end
 
 describe LogStash::Runner do
 
+  let(:channel) { Cabin::Channel.new }
+
+  before :each do
+    allow(Cabin::Channel).to receive(:get).with(LogStash).and_return(channel)
+  end
+
+
   context "argument parsing" do
     it "should run agent" do
       expect(Stud::Task).to receive(:new).once.and_return(nil)
@@ -38,31 +45,15 @@ describe LogStash::Runner do
     end
   end
 
-  describe "pipeline settings" do
-    let(:pipeline_string) { "input { stdin {} } output { stdout {} }" }
-    let(:base_pipeline_settings) { { :pipeline_id => "base", :debug_config => false } }
-    let(:pipeline) { double("pipeline") }
+  context "--auto-reload" do
+    context "when -f is not given" do
 
-    before(:each) do
-      task = Stud::Task.new { 1 }
-      allow(pipeline).to receive(:run).and_return(task)
-    end
+      let(:args) { ["agent", "-r", "-e", "input {} output {}"] }
 
-    context "when pipeline workers is not defined by the user" do
-      it "should not pass the value to the pipeline" do
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, base_pipeline_settings).and_return(pipeline)
-        args = ["agent", "-e", pipeline_string]
-        subject.run(args).wait
-      end
-    end
-
-    context "when pipeline workers is defined by the user" do
-      it "should pass the value to the pipeline" do
-        base_pipeline_settings[:pipeline_workers] = 2
-        expect(LogStash::Pipeline).to receive(:new).with(pipeline_string, base_pipeline_settings).and_return(pipeline)
-        args = ["agent", "-w", "2", "-e", pipeline_string]
-        subject.run(args).wait
+      it "should exit immediately" do
+        expect(subject.run(args).wait).to eq(1)
       end
     end
   end
+
 end

data/spec/logstash/shutdown_watcher_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 require "logstash/shutdown_watcher"
 
 describe LogStash::ShutdownWatcher do
+  let(:channel) { Cabin::Channel.new }
 
   let(:check_every) { 0.01 }
   let(:check_threshold) { 100 }
@@ -13,7 +14,10 @@ describe LogStash::ShutdownWatcher do
   report_count = 0
 
   before :each do
+    LogStash::ShutdownWatcher.logger = channel
+
     allow(pipeline).to receive(:reporter).and_return(reporter)
+    allow(pipeline).to receive(:thread).and_return(Thread.current)
     allow(reporter).to receive(:snapshot).and_return(reporter_snapshot)
     allow(reporter_snapshot).to receive(:o_simple_hash).and_return({})
 

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.2.4.snapshot2
+  version: 2.3.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4.snapshot2
-  name: logstash-core-event
+        version: 2.3.0
+  name: logstash-core-event-java
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.4.snapshot2
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   name: cabin
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
   name: pry
@@ -49,13 +49,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
   name: stud
@@ -63,13 +63,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.19
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
   name: clamp
@@ -77,7 +77,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.5
 - !ruby/object:Gem::Dependency
@@ -97,7 +97,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
   name: gems
@@ -105,7 +105,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
@@ -139,7 +139,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.5.0
   name: treetop
@@ -147,7 +147,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
@@ -167,7 +167,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
   name: minitar
@@ -175,13 +175,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.7
   name: rubyzip
@@ -189,13 +189,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
   name: thread_safe
@@ -203,13 +203,13 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.7
   name: jrjackson
@@ -217,7 +217,7 @@ dependencies:
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.7
 description: The core components of logstash, the scalable log and event management tool
@@ -237,6 +237,7 @@ files:
 - lib/logstash/config/defaults.rb
 - lib/logstash/config/file.rb
 - lib/logstash/config/grammar.rb
+- lib/logstash/config/loader.rb
 - lib/logstash/config/mixin.rb
 - lib/logstash/config/registry.rb
 - lib/logstash/environment.rb
@@ -262,6 +263,7 @@ files:
 - lib/logstash/program.rb
 - lib/logstash/runner.rb
 - lib/logstash/shutdown_watcher.rb
+- lib/logstash/special_agent.rb
 - lib/logstash/util.rb
 - lib/logstash/util/buftok.rb
 - lib/logstash/util/charset.rb
@@ -285,6 +287,7 @@ files:
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
+- spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/filters/base_spec.rb
@@ -318,14 +321,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       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.8
@@ -338,6 +341,7 @@ test_files:
 - spec/logstash/config/config_ast_spec.rb
 - spec/logstash/config/cpu_core_strategy_spec.rb
 - spec/logstash/config/defaults_spec.rb
+- spec/logstash/config/loader_spec.rb
 - spec/logstash/config/mixin_spec.rb
 - spec/logstash/environment_spec.rb
 - spec/logstash/filters/base_spec.rb