fluent-plugin-elasticsearch 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db7ae2774a9228b9590ed370a165dce4b02cffb9
-  data.tar.gz: 0a3fdd28683a0c7a63169b2ed9b9188876d205f2
+  metadata.gz: c59dd5df9cd9a3ae7cb7e32b79fce58855888dbe
+  data.tar.gz: 3bb7808c913b37088eb610bb62a59394da068f0a
 SHA512:
-  metadata.gz: 97264a9bd9817e7cd4b43e413f6ac492d61dfac495256008209f08453db1f889a188c2f46d15c674c9c619fc488deeec343169312f01daabd6654b7d31d06586
-  data.tar.gz: 42f10a91ad47b1927411cef10ddd33d093b7e56608940feb3e032c06110945b74c7d1484bcc6d1a5a136d4c59ceb85912f4ebfcc1d85cc83f2586b6e6b706041
+  metadata.gz: dcd423ab475f32322b88467b74456c290196d5dc9ffb9afddbaa845a91852875f64eedaf84edd77f68c56a56db99102d96077cd31e8ce3fc691a370976ed905e
+  data.tar.gz: f7bd63fe77c03c7d9e889869c1cc06d1f4a266be4eb503bfdd708b6cee133c1dde5bb03e0415ff85606a8d94f377837ed2962b5d912d90eb45fbfd36635a2542

data/.editorconfig

@@ -0,0 +1,9 @@
+# EditorConfig: http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2

data/History.md

@@ -2,6 +2,9 @@
 
 ### Future
 
+### 0.8.0
+- Replace Patron with Excon HTTP client
+
 ### 0.7.0
 - Add new option `time_key` (#85)
 

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '0.7.0'
+  s.version       = '0.8.0'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr@uken.com', 'diogo@uken.com']
   s.description   = %q{ElasticSearch output plugin for Fluent event collector}
@@ -17,9 +17,10 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'fluentd', '>= 0.10.43'
-  s.add_runtime_dependency 'patron', '~> 0'
+  s.add_runtime_dependency 'excon', '>= 0'
   s.add_runtime_dependency 'elasticsearch', '>= 0'
 
+
   s.add_development_dependency 'rake', '~> 0'
   s.add_development_dependency 'webmock', '~> 1'
 end

data/lib/fluent/plugin/out_elasticsearch.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'date'
-require 'patron'
+require 'excon'
 require 'elasticsearch'
 require 'uri'
 
@@ -46,7 +46,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
 
   def client
     @_es ||= begin
-      adapter_conf = lambda {|f| f.adapter :patron }
+      adapter_conf = lambda {|f| f.adapter :excon }
       transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(get_connection_options.merge(
                                                                           options: {
                                                                             reload_connections: @reload_connections,
@@ -60,7 +60,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
 
       begin
         raise ConnectionFailure, "Can not reach Elasticsearch cluster (#{connection_options_description})!" unless es.ping
-      rescue Faraday::ConnectionFailed => e
+      rescue *es.transport.host_unreachable_exceptions => e
         raise ConnectionFailure, "Can not reach Elasticsearch cluster (#{connection_options_description})! #{e.message}"
       end
 
@@ -166,7 +166,7 @@ class Fluent::ElasticsearchOutput < Fluent::BufferedOutput
     retries = 0
     begin
       client.bulk body: data
-    rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+    rescue *client.transport.host_unreachable_exceptions => e
       if retries < 2
         retries += 1
         @_es = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -26,17 +26,17 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.43
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -89,6 +89,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -127,3 +128,4 @@ summary: ElasticSearch output plugin for Fluent event collector
 test_files:
 - test/helper.rb
 - test/plugin/test_out_elasticsearch.rb
+has_rdoc: