logstash-output-elasticsearch 0.1.13-java → 0.1.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851fa04145331bbf46a5859e27197d72bcbf4e0d
-  data.tar.gz: cea045af69707fb9b874df6b1a88fff1a1a4e0a4
+  metadata.gz: 0e4a66a8523f9b25e672600abedcf3461bf34eed
+  data.tar.gz: 5f3b8251db88fbae965f0b2beeae37502b4bc678
 SHA512:
-  metadata.gz: e7a2f8d4c9f8d52faf318da314460862515d3584c46beb90582b189d8795b7d7ff8a60fa340658e6be12a950c08b674fc376096439cd1eafeea61ad59c6606af
-  data.tar.gz: 28668b405794ad2f0ea8876c603b83298f5b61d2f3c6b52bfe493cfe096c11427ab7a953b7db7b104fdef5b4023f5e6f12b788c4d67e84a33fbe8018d7bc2efe
+  metadata.gz: 8e7c5d3a6dfeb1cb93c69c4e87c56c911ff001fa91b26dfc9f454f54a1f5e71603c4308ac7403deab57c36c14e4346c87d038aebf3bb9d1bcf88bd8fcce34679
+  data.tar.gz: 1b21efc5c97a06c7dfb56f5eea73319b34cc33f6f22be375652e785d26b61904a9f16f2805e25a9ba74cabd6a004e936f4ac1e6cb586a7b2baac0ffc35d76cf1

data/lib/logstash/outputs/elasticsearch.rb

@@ -419,9 +419,8 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
     end
   end
 
-  # Does not raise an exception to prevent Stud::Buffer from 
-  # attempting to resubmit successful actions within the bulk 
-  # request.
+  # When there are exceptions raised upon submission, we raise an exception so that
+  # Stud::Buffer will retry to flush
   public
   def flush(actions, teardown = false)
     begin
@@ -429,6 +428,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
       submit(actions)
     rescue => e
       @logger.error "Got error to send bulk of actions to elasticsearch server at #{@host[@client_idx]} : #{e.message}"
+      raise e
     ensure
       unless @protocol == "node"
         @logger.debug? and @logger.debug "Shifting current elasticsearch client"

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '0.1.13'
+  s.version         = '0.1.14'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"

data/spec/outputs/elasticsearch_spec.rb

@@ -113,7 +113,7 @@ describe "outputs/elasticsearch" do
         end
       end
 
-      it "should creat new documents without id" do
+      it "should create new documents without id" do
         subject = get_es_output("create")
         subject.register
         subject.receive(LogStash::Event.new("message" => "sample message here"))
@@ -142,16 +142,11 @@ describe "outputs/elasticsearch" do
       end
 
       it "should fail to create a document when no id is specified" do
-        subject = get_es_output("create_unless_exists")
+        event = LogStash::Event.new("somevalue" => 100, "@timestamp" => "2014-11-17T20:37:17.223Z", "@metadata" => {"retry_count" => 0})
+        action = ["create_unless_exists", {:_id=>nil, :_index=>"logstash-2014.11.17", :_type=>"logs"}, event]
+        subject = get_es_output(action[0])
         subject.register
-        subject.receive(LogStash::Event.new("message" => "sample message here"))
-        subject.buffer_flush(:final => true)
-        es.indices.refresh
-        # Wait or fail until everything's indexed.
-        Stud::try(3.times) do
-          r = es.search
-          insist { r["hits"]["total"] } == 0
-        end
+        expect { subject.flush([action]) }.to raise_error
       end
 
       it "should unsuccesfully submit two records with the same document id" do
@@ -532,6 +527,20 @@ describe "outputs/elasticsearch" do
           sleep(2)
         end
 
+        it "should raise exception and be retried by stud::buffer" do
+          call_count = 0
+          expect(subject).to receive(:submit).with([action1]).exactly(3).times do
+            if (call_count += 1) <= 2
+              raise "error first two times"
+            else
+              {"errors" => false}
+            end
+          end
+          subject.register
+          subject.receive(event1)
+          subject.buffer_flush(:final => true)
+        end
+
         it "should retry actions with response status of 503" do
           mock_actions_with_response({"errors" => true, "statuses" => [200, 200, 503, 503]},
                                      {"errors" => true, "statuses" => [200, 503]},

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: java
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby