logstash-core 1.5.0.rc4.snapshot1-java → 1.5.0.rc4.snapshot2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f61653420801a9a84cdd426bb71450762c6fe34
-  data.tar.gz: 81c20f44de45afb382a4591b21ce770c56d6c566
+  metadata.gz: 4c172a7e60e5b827f266a9c31118630f53af974b
+  data.tar.gz: 4e60b82765c5e3bb2a34533edc8ec5cec562708f
 SHA512:
-  metadata.gz: e217427a37fa38b8e942a82d1848a83e1cbf495535dd523ee316e708107dbfa50ae8a6e9104ce297bda8f51018a10cb36690326840d3ea5ff6bf0774bba5d59c
-  data.tar.gz: 181ad60293edf7793cc8a1538df77654f5d620fc116befd8ac660fd226310b6b21032226ac6ce79bb6a0ec6a8e6432dc726f4259959779775af7fdac247ee4c3
+  metadata.gz: 4623f3461e89f628f0557c3659cbea9fd64dc5a2269703582cd85190db6d68c5bf6692ca890b3467cecce0d1aeb69c525781102237ec45c24db4ff5021381dd9
+  data.tar.gz: 25734226e0102e256893c616de68b03a9fe7b23f4404b77652a6359b69140898fe355b8414c8ecc4664247fe285f1bf2ec12b7602ed43370ce688ea2084dc6e5

data/lib/logstash/environment.rb

@@ -6,16 +6,13 @@ module LogStash
     extend self
 
     # rehydrate the bootstrap environment if the startup was not done by executing bootstrap.rb
-    unless LogStash::Environment.const_defined?("LOGSTASH_HOME")
-      abort("ERROR: missing LOGSTASH_HOME environment variable") if ENV["LOGSTASH_HOME"].to_s.empty?
+    # and we are in the context of the logstash package
+    if !LogStash::Environment.const_defined?("LOGSTASH_HOME") &&  !ENV["LOGSTASH_HOME"].to_s.empty?
       $LOAD_PATH << ::File.join(ENV["LOGSTASH_HOME"], "lib")
       require "bootstrap/environment"
     end
 
     LOGSTASH_CORE = ::File.expand_path(::File.join(::File.dirname(__FILE__), "..", ".."))
-    BUNDLE_CONFIG_PATH = ::File.join(LOGSTASH_HOME, ".bundle", "config")
-    BOOTSTRAP_GEM_PATH = ::File.join(LOGSTASH_HOME, 'build', 'bootstrap')
-
     LOGSTASH_ENV = (ENV["LS_ENV"] || 'production').to_s.freeze
 
     def env

data/lib/logstash/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc4.snapshot1
+  version: 1.5.0.rc4.snapshot2
 platform: java
 authors:
 - Jordan Sissel
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cabin
@@ -245,7 +245,6 @@ files:
 - spec/util/gemfile_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
-- spec/util/retryable_spec.rb
 - spec/util_spec.rb
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
@@ -294,5 +293,4 @@ test_files:
 - spec/util/gemfile_spec.rb
 - spec/util/json_spec.rb
 - spec/util/plugin_version_spec.rb
-- spec/util/retryable_spec.rb
 - spec/util_spec.rb

data/spec/util/retryable_spec.rb

@@ -1,145 +0,0 @@
-require "logstash/util/retryable"
-require "insist"
-
-describe LogStash::Retryable do
-  class C
-    include LogStash::Retryable
-  end
-
-  class E < StandardError; end;
-  class F < StandardError; end;
-
-  subject do
-    C.new.tap do |c|
-      c.stub(:sleep)
-    end
-  end
-
-  context "with default fixed 1 second retry sleep" do
-
-    it "should execute once" do
-      subject.should_receive(:sleep).never
-      expect(subject.retryable(:rescue => nil){|i| expect(i).to eq(0); "foo"}).to eq("foo")
-    end
-
-    it "should not retry on non rescued exceptions" do
-      i = 0
-      subject.should_receive(:sleep).never
-      expect{subject.retryable(:rescue => E){ i += 1; raise F}}.to raise_error(F)
-      expect(i).to eq(1)
-    end
-
-    it "should execute once and retry once by default" do
-      i = 0
-      subject.should_receive(:sleep).once.with(1)
-      expect{subject.retryable{i += 1; raise E}}.to raise_error(E)
-      expect(i).to eq(2)
-    end
-
-    it "should retry on rescued exceptions" do
-      i = 0
-      subject.should_receive(:sleep).once.with(1)
-      expect{subject.retryable(:rescue => E){ i += 1; raise E}}.to raise_error(E)
-      expect(i).to eq(2)
-    end
-
-    it "should retry indefinitely" do
-      i = 0
-      subject.should_receive(:sleep).exactly(50).times.with(1)
-      expect{subject.retryable(:tries => 0, :rescue => E){ i += 1; raise i <= 50 ? E : F}}.to raise_error(F)
-    end
-
-    it "should execute once and retry once by default and execute on_retry callback" do
-      i = 0
-      callback_values = []
-
-      callback = lambda do |retry_count, e|
-        callback_values << [retry_count, e]
-      end
-
-      subject.should_receive(:sleep).once.with(1)
-
-      expect do
-        subject.retryable(:on_retry => callback){i += 1; raise E}
-      end.to raise_error
-
-      expect(i).to eq(2)
-
-      expect(callback_values.size).to eq(1)
-      expect(callback_values[0][0]).to eq(1)
-      expect(callback_values[0][1]).to be_a(E)
-    end
-
-    it "should execute once and retry n times" do
-      i = 0
-      n = 3
-      subject.should_receive(:sleep).exactly(n).times.with(1)
-      expect{subject.retryable(:tries => n){i += 1; raise E}}.to raise_error(E)
-      expect(i).to eq(n + 1)
-    end
-
-    it "should execute once and retry n times and execute on_retry callback" do
-      i = 0
-      n = 3
-      callback_values = []
-
-      callback = lambda do |retry_count, e|
-        callback_values << [retry_count, e]
-      end
-
-      subject.should_receive(:sleep).exactly(n).times.with(1)
-
-      expect do
-        subject.retryable(:tries => n, :on_retry => callback){i += 1; raise E}
-      end.to raise_error
-
-      expect(i).to eq(n + 1)
-
-      expect(callback_values.size).to eq(n)
-      n.times.each do |j|
-        expect(callback_values[j].first).to eq(j + 1)
-        expect(callback_values[j].last).to be_a(E)
-      end
-    end
-  end
-
-  context "with exponential backoff" do
-
-    it "should execute once and retry once with base sleep by default" do
-      subject.should_receive(:sleep).once.with(2)
-      expect do
-        subject.retryable(:base_sleep => 2, :max_sleep => 10){raise E}
-      end.to raise_error(E)
-    end
-
-    it "should execute once and retry n times with exponential backoff sleep" do
-      n = 3
-      s = 0.5
-
-      n.times.each do |i|
-        subject.should_receive(:sleep).once.with(s * (2 ** i)).ordered
-      end
-      expect do
-        subject.retryable(:tries => n, :base_sleep => s, :max_sleep => 100){raise E}
-      end.to raise_error(E)
-    end
-
-    it "should execute once and retry n times with exponential backoff sleep capping at max_sleep" do
-      n = 20
-      base_sleep = 0.1
-      max_sleep = 1
-
-      subject.should_receive(:sleep).once.with(0.1).ordered
-      subject.should_receive(:sleep).once.with(0.2).ordered
-      subject.should_receive(:sleep).once.with(0.4).ordered
-      subject.should_receive(:sleep).once.with(0.8).ordered
-      (n - 4).times.each do |i|
-        subject.should_receive(:sleep).once.with(1).ordered
-      end
-      expect do
-        subject.retryable(:tries => n, :base_sleep => base_sleep, :max_sleep => max_sleep){raise E}
-      end.to raise_error(E)
-    end
-  end
-
-end