logstash-core 2.2.0.snapshot3-java → 2.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7857e5445f210282edca3adc2180baaa618e37b
-  data.tar.gz: fc225f76018d011dbd0ae2b03cc8245df78f1293
+  metadata.gz: 79aea5801f122b108d1bf5348fc9161415f30c16
+  data.tar.gz: b067b5351bc10d6d90dfdda009befbb27ed619d8
 SHA512:
-  metadata.gz: 86be18d25f189e0a406cfa846b57cdf4c14ff9375e115304fd11e0ce26ed4d9810db88ebc019e8c3850a1dd8be76a2df3f8c84750cb7929450a19f27e00c35f1
-  data.tar.gz: a83f30280dc94bd6580af794436fc0055c4d3e0677f54d25d5cb70d839d197f950f094e9e6cedba79cc3d6ef22f013d479cf80153af448ddab664d4faa142cf8
+  metadata.gz: a59cd791e6a4c185d25cf3ad398d9e75dc65b437e0bcc8509a9ba4a7ef9d6d7364179352ff98fce94f1e49123ab3dc2c5192fefa91d25dd02ffd3f895f39059c
+  data.tar.gz: b28cffde1b401b6a097c3d5c7332003eb9023a91a6e2c7233fc2bdc27cc925946929bbf82b84d5012b545abcafdd81fed76c327382b43167a0e7c5a8249c485f

data/lib/logstash-core/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_VERSION = "2.2.0.snapshot3"
+LOGSTASH_CORE_VERSION = "2.2.1"

data/lib/logstash/agent.rb

@@ -22,21 +22,24 @@ class LogStash::Agent < Clamp::Command
     :default => "", :attribute_name => :config_string
 
   option ["-w", "--pipeline-workers"], "COUNT",
-         I18n.t("logstash.runner.flag.pipeline-workers"),
+         I18n.t("logstash.agent.flag.pipeline-workers"),
          :attribute_name => :pipeline_workers,
          :default => LogStash::Pipeline::DEFAULT_SETTINGS[:default_pipeline_workers]
 
-
   option ["-b", "--pipeline-batch-size"], "SIZE",
-         I18n.t("logstash.runner.flag.pipeline-batch-size"),
+         I18n.t("logstash.agent.flag.pipeline-batch-size"),
          :attribute_name => :pipeline_batch_size,
          :default => LogStash::Pipeline::DEFAULT_SETTINGS[:pipeline_batch_size]
 
   option ["-u", "--pipeline-batch-delay"], "DELAY_IN_MS",
-         I18n.t("logstash.runner.flag.pipeline-batch-delay"),
+         I18n.t("logstash.agent.flag.pipeline-batch-delay"),
          :attribute_name => :pipeline_batch_delay,
          :default => LogStash::Pipeline::DEFAULT_SETTINGS[:pipeline_batch_delay]
 
+  option ["--filterworkers"], "COUNT",
+         I18n.t("logstash.agent.flag.filterworkers"),
+         :attribute_name => :filter_workers
+
   option ["-l", "--log"], "FILE",
     I18n.t("logstash.agent.flag.log"),
     :attribute_name => :log_file
@@ -135,6 +138,12 @@ class LogStash::Agent < Clamp::Command
     end
     configure
 
+
+    if filter_workers
+      @logger.warn("--filter-workers is deprecated! Please use --pipeline-workers or -w. This setting will be removed in the next major version!")
+      self.pipeline_workers = filter_workers
+    end
+
     # You must specify a config_string or config_path
     if @config_string.nil? && @config_path.nil?
       fail(help + "\n" + I18n.t("logstash.agent.missing-configuration"))
@@ -158,6 +167,7 @@ class LogStash::Agent < Clamp::Command
       end
     end
 
+
     begin
       pipeline = LogStash::Pipeline.new(@config_string, @pipeline_settings)
     rescue LoadError => e

data/lib/logstash/pipeline.rb

@@ -72,8 +72,6 @@ module LogStash; class Pipeline
     @ready = Concurrent::AtomicBoolean.new(false)
     @running = Concurrent::AtomicBoolean.new(false)
     @flushing = Concurrent::AtomicReference.new(false)
-
-    start_flusher
   end # def initialize
 
   def ready?
@@ -130,9 +128,10 @@ module LogStash; class Pipeline
     # Block until all inputs have stopped
     # Generally this happens if SIGINT is sent and `shutdown` is called from an external thread
 
-    @running.make_true
+    transition_to_running
+    start_flusher # Launches a non-blocking thread for flush events
     wait_inputs
-    @running.make_false
+    transition_to_stopped
 
     @logger.info("Input plugins stopped! Will shutdown filter/output workers.")
 
@@ -146,6 +145,22 @@ module LogStash; class Pipeline
     return 0
   end # def run
 
+  def transition_to_running
+    @running.make_true
+  end
+
+  def transition_to_stopped
+    @running.make_false
+  end
+
+  def running?
+    @running.true?
+  end
+
+  def stopped?
+    @running.false?
+  end
+
   def start_workers
     @inflight_batches = {}
 
@@ -415,10 +430,13 @@ module LogStash; class Pipeline
   end
 
   def start_flusher
+    # Invariant to help detect improper initialization
+    raise "Attempted to start flusher on a stopped pipeline!" if stopped?
+
     @flusher_thread = Thread.new do
-      while Stud.stoppable_sleep(5, 0.1) { @running.false? }
+      while Stud.stoppable_sleep(5, 0.1) { stopped? }
         flush
-        break if @running.false?
+        break if stopped?
       end
     end
   end

data/lib/logstash/util.rb

@@ -193,7 +193,7 @@ module LogStash::Util
     when Fixnum, Symbol, IO, TrueClass, FalseClass, NilClass
       o
     when LogStash::Codecs::Base
-      o.clone.tap {|c| c.register }
+      o.clone
     when String
       o.clone #need to keep internal state e.g. frozen
     else

data/lib/logstash/version.rb

@@ -11,4 +11,4 @@
 #       eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be
 #       fixed.
 
-LOGSTASH_VERSION = "2.2.0.snapshot3"
+LOGSTASH_VERSION = "2.2.1"

data/locales/en.yml

@@ -157,6 +157,8 @@ en:
           Check configuration for valid syntax and then exit.
         pipeline-workers: |+
           Sets the number of pipeline workers to run.
+        filterworkers: |+
+          DEPRECATED. Now an alias for --pipeline-workers and -w
         pipeline-batch-size: |+
           Size of batches the pipeline is to work in.
         pipeline-batch-delay: |+

data/logstash-core.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LOGSTASH_CORE_VERSION
 
-  gem.add_runtime_dependency "logstash-core-event", "~> 2.2.0.snapshot3"
+  gem.add_runtime_dependency "logstash-core-event", "~> 2.2.1"
 
   gem.add_runtime_dependency "cabin", "~> 0.7.0" #(Apache 2.0 license)
   gem.add_runtime_dependency "pry", "~> 0.10.1"  #(Ruby license)

data/spec/logstash/pipeline_spec.rb

@@ -232,6 +232,24 @@ describe LogStash::Pipeline do
   end
 
   context "compiled flush function" do
+    describe "flusher thread" 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
+
+      let(:config) { "input { dummyinput {} } output { dummyoutput {} }"}
+
+      it "should start the flusher thread only after the pipeline is running" do
+        pipeline = TestPipeline.new(config)
+
+        expect(pipeline).to receive(:transition_to_running).ordered.and_call_original
+        expect(pipeline).to receive(:start_flusher).ordered.and_call_original
+
+        pipeline.run
+      end
+    end
 
     context "cancelled events should not propagate down the filters" do
       config <<-CONFIG

data/spec/logstash/plugin_spec.rb

@@ -144,9 +144,26 @@ describe LogStash::Plugin do
     ].each do |klass|
 
       it "subclass #{klass.name} does not modify params" do
-        instance = klass.new(args)
+        klass.new(args)
         expect(args).to be_empty
       end
     end
+
+    context "codec initialization" do
+
+      class LogStash::Codecs::Noop < LogStash::Codecs::Base
+        config_name "noop"
+
+        config :format, :validate => :string
+        def register; end
+      end
+
+      it "should only register once" do
+        args   = { "codec" => LogStash::Codecs::Noop.new("format" => ".") }
+        expect_any_instance_of(LogStash::Codecs::Noop).to receive(:register).once
+        LogStash::Plugin.new(args)
+      end
+
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 2.2.0.snapshot3
+  version: 2.2.1
 platform: java
 authors:
 - Jordan Sissel
@@ -10,14 +10,14 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0.snapshot3
+        version: 2.2.1
   name: logstash-core-event
   prerelease: false
   type: :runtime
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0.snapshot3
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -327,9 +327,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