logstash-input-couchdb_changes 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f797e90410dcc7b96060c4dc81714405f2501b6a
-  data.tar.gz: fcff3b7ed78fd32ed6ecd0d0e9cea59ad7056dc3
+  metadata.gz: 6a8131807cfa1a761f229f26f633b511625bc4c8
+  data.tar.gz: 17fdd30e692b7a3401bf1905bba8a7b663a55a38
 SHA512:
-  metadata.gz: 4bbaf6d75f6a1f3f3b824585f188d97c4e63ac0db78803a02675d735e3e5cc072a7b4987056022fc5980ecd9d839255d8fc7d66c3826b648a8d7a82ec07b2f06
-  data.tar.gz: da5d2ed95cbed626c8cdc7135594e52a659a75711d840aac5345cec1fb411dec683436c63f5cd255cf677d0d5da6cbb1fe322055506d8b34269c498041f5a515
+  metadata.gz: aa001b4b0f2a235af1d709fde14fdaa3801452a47631ed4724f9abf17773f8250e2a0e46ae3a8343b7f74c0ccfde719d6f4d2eaf185b8d110822ff95dd6f6f11
+  data.tar.gz: 3363128bf9b5cb18c4768c19ad90f6ca03f88c9498da671efd68eaf37f4991f34c77466859495493043c0b90f98d8f343a431ce494be8c56e25752d666de0e93

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+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.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/couchdb_changes.rb

@@ -138,38 +138,47 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
     buffer = FileWatch::BufferedTokenizer.new
     @logger.info("Connecting to CouchDB _changes stream at:", :host => @host.to_s, :port => @port.to_s, :db => @db)
     uri = build_uri
-    Net::HTTP.start(@host, @port, :use_ssl => (@secure == true), :ca_file => @ca_file) do |http|
-
-      request = Net::HTTP::Get.new(uri.request_uri)
-      request.basic_auth(@username, @password.value) if @username && @password
-      http.request request do |response|
-        raise ArgumentError, "Database not found!" if response.code == "404"
-        response.read_body do |chunk|
-          buffer.extract(chunk).each do |changes|
-            # If no changes come since the last heartbeat period, a blank line is
-            # sent as a sort of keep-alive.  We should ignore those.
-            next if changes.chomp.empty?
-            if event = build_event(changes)
-              @logger.debug("event", :event => event.to_hash_with_metadata) if @logger.debug?
-              decorate(event)
-              queue << event
-              @sequence = event['@metadata']['seq']
-              @sequencedb.write(@sequence.to_s)
+    until stop?
+      begin
+        Net::HTTP.start(@host, @port, :use_ssl => (@secure == true), :ca_file => @ca_file) do |http|
+
+          request = Net::HTTP::Get.new(uri.request_uri)
+          request.basic_auth(@username, @password.value) if @username && @password
+          http.request request do |response|
+            raise ArgumentError, "Database not found!" if response.code == "404"
+            response.read_body do |chunk|
+              buffer.extract(chunk).each do |changes|
+                # Put a "stop" check here. If we stop here, anything we've read, but
+                # not written, will be read again since the @sequence change won't
+                # have been written to the file, ensuring that it will pick up where
+                # it left off.
+                break if stop?
+                # If no changes come since the last heartbeat period, a blank line is
+                # sent as a sort of keep-alive.  We should ignore those.
+                next if changes.chomp.empty?
+                if event = build_event(changes)
+                  @logger.debug("event", :event => event.to_hash_with_metadata) if @logger.debug?
+                  decorate(event)
+                  queue << event
+                  @sequence = event['@metadata']['seq']
+                  @sequencedb.write(@sequence.to_s)
+                end
+              end
             end
           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)
+        retry if reconnect?
+      rescue Errno::EBADF => e
+        @logger.error("Unable to connect: Bad file descriptor: ", :error => e.to_s)
+        retry if reconnect?
+      rescue ArgumentError => e
+        @logger.error("Unable to connect to database", :db => @db, :error => e.to_s)
+        retry if reconnect?
       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)
-    retry if reconnect?
-  rescue Errno::EBADF => e
-    @logger.error("Unable to connect: Bad file descriptor: ", :error => e.to_s)
-    retry if reconnect?
-  rescue ArgumentError => e
-    @logger.error("Unable to connect to database", :db => @db, :error => e.to_s)
-    retry if reconnect?
   end
 
   private
@@ -181,7 +190,7 @@ class LogStash::Inputs::CouchDBChanges < LogStash::Inputs::Base
 
   private
   def reconnect?
-    sleep(@always_reconnect ? @reconnect_delay : 0)
+    Stud.stoppable_sleep(@connect_retry_interval) if @always_reconnect
     @always_reconnect
   end
 

data/logstash-input-couchdb_changes.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-couchdb_changes'
-  s.version         = '1.0.0'
+  s.version         = '2.0.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/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,8 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
+  s.add_runtime_dependency "stud", '>= 0.0.22'
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'json'
 

data/spec/inputs/couchdb_changes_spec.rb

@@ -94,13 +94,13 @@ module Helpers
   def buildup
     # BEGIN: The following calls are a safety net in case of an aborted test
     deleteuser
-    teardown
+    close
     # END
     createdb
     populatedb
   end
 
-  def teardown
+  def close
     deletedb
     deleteindex
     sequence = "/tmp/.couchdb_seq"
@@ -109,6 +109,24 @@ module Helpers
 end
 
 describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
+  describe LogStash::Inputs::CouchDBChanges do
+    include Helpers
+    sequence = "/tmp/.couchdb_seq"
+
+    before do
+      buildup
+    end
+
+    it_behaves_like "an interruptible input plugin" do
+      let(:config) {
+        {
+          "db" => "db", "timeout" => 1000, "always_reconnect" => true,
+          "sequence_path" => "#{sequence}", "host" => "127.0.0.1"
+        }
+      }
+    end
+  end
+
   describe "Load couchdb documents", :elasticsearch => true, :couchdb => true do
     include Helpers
     sequence = "/tmp/.couchdb_seq"
@@ -172,7 +190,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
       end
     end
     after do
-      teardown
+      close
     end
   end
 
@@ -237,7 +255,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
     end
 
     after do
-      teardown
+      close
     end
 
   end
@@ -312,7 +330,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
     end
 
     after do
-      teardown
+      close
     end
 
   end
@@ -369,7 +387,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
     end
 
     after do
-      teardown
+      close
     end
 
   end
@@ -435,7 +453,7 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
 
     after do
       deleteuser
-      teardown
+      close
     end
   end
 
@@ -498,11 +516,8 @@ describe "inputs/couchdb_changes", :elasticsearch => true, :couchdb => true do
     end
 
     after do
-      teardown
+      close
     end
   end
 
 end
-
-
-

metadata

@@ -1,112 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-couchdb_changes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.snapshot
   name: logstash-core
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.0.22
+  name: stud
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-codec-plain
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.22
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ftw
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.42
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.42
+  name: ftw
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.42
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.6
+  name: logstash-devutils
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: logstash-output-elasticsearch
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-output-elasticsearch
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - DEVELOPER.md
@@ -114,7 +121,6 @@ files:
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/couchdb_changes.rb
 - logstash-input-couchdb_changes.gemspec
 - spec/inputs/ca_cert.pem
@@ -143,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This input captures the _changes stream from a CouchDB instance

data/.gitignore

@@ -1,5 +0,0 @@
-*.gem
-Gemfile.lock
-Gemfile.bak
-.bundle
-vendor

data/Rakefile

@@ -1 +0,0 @@
-require "logstash/devutils/rake"