logstash-input-couchdb_changes 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88bf3deb6f08fc2b9dd440b6381fed5b1ccabce5
-  data.tar.gz: c4523568b3bd47a2fb6f5c4c3432bf1b92d21368
+  metadata.gz: 5e92054f4d3f216540befdcd740b28f7ec22dff8
+  data.tar.gz: eb4430e71ac3e1cbab09ea3ed89e106f0377c723
 SHA512:
-  metadata.gz: bab5abe79c8fef9e05cab283d19a12d8b36ed9131a104436ee7e737cd5c14184a8d323be1843a7c5ce8f40c71bdae42ad9b283deadb83fb31f4b674bb2838529
-  data.tar.gz: 160fe3743a7e8c2ff0f0fa770786a6d45bc49328d779940115378ca03dbc14d9a277830cf6b16bc82e5a838a175dbf2a1a8b996adda7c923677d1d05fd63b8de
+  metadata.gz: 4a911bbfdcc68b45505e3bee5783056375e487dfcd61f316f964bb0dd29fc2731f388df530b905c7fccd5c77a8ba9820fa971c6b5923f5029f6bf285d7280feb
+  data.tar.gz: 832c9d2d9a795903b59ad8a77e7292c124ea21af2539ee451037cce210825ea12df485f6130c9cc979eb14abb5918f72b3de7750ed6380a428be0d2e80cabf55

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.1.0
+  - Fail fast on permission denied accessing the sequence file
+  - Introduced new config 'keep_id'
+  - Fixed hard coded delay in error message
+  - CouchDB hostname resolution failure support
+
 ## 3.0.2
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
 

data/lib/logstash/inputs/couchdb_changes.rb

@@ -64,6 +64,10 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
   # and that you will unset this value afterwards.
   config :initial_sequence, :validate => :number
 
+  # Preserve the CouchDB document id "_id" value in the
+  # output.
+  config :keep_id, :validate => :boolean, :default => false
+
   # Preserve the CouchDB document revision "_rev" value in the
   # output.
   config :keep_revision, :validate => :boolean, :default => false
@@ -112,7 +116,16 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
 
     @scheme = @secure ? 'https' : 'http'
 
-    @sequence = @initial_sequence ? @initial_sequence : @sequencedb.read
+    if !@initial_sequence.nil?
+      @logger.info("initial_sequence is set, writing to filesystem ...",
+                   :initial_sequence => @initial_sequence, :sequence_path => @sequence_path)
+      @sequencedb.write(@initial_sequence)
+      @sequence = @initial_sequence
+    else
+      @logger.info("No initial_sequence set, reading from filesystem ...",
+                   :sequence_path => @sequence_path)
+      @sequence = @sequencedb.read
+    end
 
   end
 
@@ -172,8 +185,8 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
           end
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED,
-        Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-        @logger.error("Connection problem encountered: Retrying connection in 10 seconds...", :error => e.to_s)
+        Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, SocketError => e
+        @logger.error("Connection problem encountered: Retrying connection in " + @reconnect_delay.to_s + " seconds...", :error => e.to_s, :host => @host.to_s, :port => @port.to_s, :db => @db)
         retry if reconnect?
       rescue Errno::EBADF => e
         @logger.error("Unable to connect: Bad file descriptor: ", :error => e.to_s)
@@ -214,7 +227,7 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
     else
       hash['doc'] = data['doc']
       hash['@metadata']['action'] = 'update'
-      hash['doc'].delete('_id')
+      hash['doc'].delete('_id') unless @keep_id
       hash['doc_as_upsert'] = true
       hash['doc'].delete('_rev') unless @keep_revision
     end

data/logstash-input-couchdb_changes.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-couchdb_changes'
-  s.version         = '3.0.2'
+  s.version         = '3.1.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This input captures the _changes stream from a CouchDB instance"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-couchdb_changes
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This input captures the _changes stream from a CouchDB instance