From 8f02e6b2dfc0f32f5631621957af9ac536c49f7b Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 4 Dec 2015 15:30:23 -0600 Subject: [PATCH 1/2] Always set plugin vars in protocol.rb. This fixes broken specs. --- lib/logstash/outputs/elasticsearch_java/protocol.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/logstash/outputs/elasticsearch_java/protocol.rb b/lib/logstash/outputs/elasticsearch_java/protocol.rb index 0eae276..56e4c51 100644 --- a/lib/logstash/outputs/elasticsearch_java/protocol.rb +++ b/lib/logstash/outputs/elasticsearch_java/protocol.rb @@ -6,6 +6,7 @@ module LogStash module Outputs module ElasticSearchJavaPlugins module Protocols DEFAULT_OPTIONS = { :port => 9300, + :elasticsearch_plugins => [] } class NodeClient From 42f5cd71a188871762776e6d8e23541a1da4d7aa Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 4 Dec 2015 15:30:58 -0600 Subject: [PATCH 2/2] Add a simple .travis.yml --- .travis.yml | 7 ++++--- README.md | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94409c8..f4a084c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,11 @@ before_install: - curl -s https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.0.0/elasticsearch-2.0.0.tar.gz > elasticsearch.tar.gz - tar -xzf elasticsearch.tar.gz - cd elasticsearch*/ && bin/elasticsearch & - - sleep 10 - - curl http://localhost:9200 + - sleep 10 && curl http://localhost:9200 +before_script: + - bundle exec rake vendor language: ruby cache: bundler rvm: - jruby-19mode -script: bundle exec rake vendor && bundle exec rspec spec && bundle exec rspec spec +script: bundle exec rspec spec && bundle exec rspec spec diff --git a/README.md b/README.md index 968b961..a809a8c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Build Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-elasticsearch_java-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-elasticsearch_java-unit/) +[![Build Status](https://travis-ci.org/logstash-plugins/logstash-output-elasticsearch_java.svg)](https://travis-ci.org/logstash-plugins/logstash-output-elasticsearch_java) + This is a plugin for [Logstash](https://github.com/elastic/logstash). It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.