logstash-input-mongodb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5239efc622206199789eedf0e1af75242fc6262d
-  data.tar.gz: d254084e1e1b9791b02e4f3207260da0f11cf046
+  metadata.gz: 388af0f33d8e7e99f421dfb5f178b213b394fbb8
+  data.tar.gz: a5275546392e3c9c588f266e9d84f5c8124af36b
 SHA512:
-  metadata.gz: d717f6a55dbe745b3e4c66bb43465559c7c409dc9d0191636ab49f23c3c054d6b55f2283ba45aa11a5ac245c6040925185cada2e5637606c903f84f29d32ec83
-  data.tar.gz: 61562cf62e60a8f6055d4f31849dc06d5033bffdf01ed1858e71938d3d04d77a88a1278cd1f6efeebfc5b74e81c52ed0ed1619c85ffeac411cbf3536d1f2accc
+  metadata.gz: e61433c0e8d75fcb990c7353d5ba5edb3af08a5ae924696b40f8ad2b0e0e4a2edef4d71a204caf2b6d7dc439b85db24983edade05f1725c3fa713284974583d5
+  data.tar.gz: 45321ea60084617ea0e917632b072cd12eae3a6098de2712dc3a8eb4b15738cb164821e17daee8b92ec29c04c8f17c686767726338c6c131476055ca38245862

data/README.md

@@ -69,3 +69,9 @@ output {
   }
 }
 ```
+
+### MongoDB URI
+
+The URI parameter is where you would specify all of your mongodb options including things like auth and SSL. You should use a connection string (URI) compatible with the mongodb spec.
+
+For more information on MongoDB URI's please see the MongoDB documentation: https://docs.mongodb.org/v3.0/reference/connection-string/

data/lib/logstash/inputs/mongodb.rb

@@ -213,10 +213,11 @@ class LogStash::Inputs::MongoDB < LogStash::Inputs::Base
     sleep_max = 5
     sleeptime = sleep_min
 
-    begin
-      @logger.debug("Tailing MongoDB")
-      @logger.debug("Collection data is: #{@collection_data}")
-      loop do
+    @logger.debug("Tailing MongoDB")
+    @logger.debug("Collection data is: #{@collection_data}")
+
+    while true && !stop?
+      begin
         @collection_data.each do |index, collection|
           collection_name = collection[:name]
           @logger.debug("collection_data is: #{@collection_data}")
@@ -341,13 +342,15 @@ class LogStash::Inputs::MongoDB < LogStash::Inputs::Base
         @logger.debug("No new rows. Sleeping.", :time => sleeptime)
         sleeptime = [sleeptime * 2, sleep_max].min
         sleep(sleeptime)
-        #sleeptime = sleep_min
-      end
-    rescue LogStash::ShutdownSignal
-      if @interrupted
-        @logger.debug("Mongo Input shutting down")
+      rescue => e
+        @logger.warn('MongoDB Input threw an exception, restarting', :exception => e)
       end
     end
   end # def run
 
+  def close
+    # If needed, use this to tidy up on shutdown
+    @logger.debug("Shutting down...")
+  end
+
 end # class LogStash::Inputs::Example

data/logstash-input-mongodb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-mongodb'
-  s.version = '0.3.2'
+  s.version = '0.3.3'
   s.licenses = ['Apache License (2.0)']
   s.summary = "This takes entries from mongodb as an input to logstash."
   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"

data/spec/inputs/mongodb_spec.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+
+require "logstash/devutils/rspec/spec_helper"
+require "tempfile"
+require "stud/temporary"
+require "logstash/inputs/mongodb"
+
+FILE_DELIMITER = LogStash::Environment.windows? ? "\r\n" : "\n"
+
+describe LogStash::Inputs::Mongodb do
+  before(:all) do
+    @abort_on_exception = Thread.abort_on_exception
+    Thread.abort_on_exception = true
+  end
+
+  after(:all) do
+    Thread.abort_on_exception = @abort_on_exception
+  end
+
+  it_behaves_like "an interruptible input plugin" do
+    let(:config) do
+      {
+        placeholder_db_dir => Stud::Temporary.pathname,
+        placeholder_db_bame => Stud::Temporary.file,
+        collection => 'logstash-input-mongodb_test'
+      }
+    end
+  end
+
+  it "should start at the beginning of a collection when no sincedb data exists" do
+    placeholder_db_dir = Stud::Temporary.pathname
+    placeholder_db_name = Stud::Temporary.pathname
+    collection = 'logstash-input-mongodb_test'
+
+    conf = <<-CONFIG
+      input {
+        mongodb {
+          uri => 'mongodb://localhost/logstash-input-mongodb_test',
+          placeholder_db_dir => "#{placeholder_db_dir}"
+          placeholder_db_name => "#{placeholder_db_name}"
+          collection => "#{collection}"
+        }
+      }
+    CONFIG
+
+    # Create the test DB and populate it with some data
+    # add "first message"
+    # add "second message"
+
+    events = input(conf) do |pipeline, queue|
+
+      events = []
+
+      retries = 0
+      while retries < 20
+        # Add some new entries to the database
+        # add "third message"
+        # add "fourth message"
+
+        if queue.size >= 4
+          events = 4.times.collect { queue.pop }
+          break
+        end
+
+        sleep(0.1)
+        retries += 1
+      end
+
+      events
+    end
+
+    insist { events[0]["message"] } == "first message"
+    insist { events[1]["message"] } == "second message"
+    insist { events[2]["message"] } == "third message"
+    insist { events[3]["message"] } == "fourth message"
+  end
+
+  it "should start where it left off in a collection when it has sincedb data" do
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-mongodb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Philip Hutchins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -128,7 +128,7 @@ files:
 - README.md
 - lib/logstash/inputs/mongodb.rb
 - logstash-input-mongodb.gemspec
-- spec/inputs/example_spec.rb
+- spec/inputs/mongodb_spec.rb
 homepage: http://www.phutchins.com
 licenses:
 - Apache License (2.0)
@@ -156,4 +156,4 @@ signing_key:
 specification_version: 4
 summary: This takes entries from mongodb as an input to logstash.
 test_files:
-- spec/inputs/example_spec.rb
+- spec/inputs/mongodb_spec.rb

data/spec/inputs/example_spec.rb

@@ -1 +0,0 @@
-require "logstash/devutils/rspec/spec_helper"