Update to support logstash 2.0.

Author: Ahmed Ammar

lib/logstash-input-dynamodb_jars.rb

@@ -15,7 +15,8 @@
 require_jar( 'com.amazonaws', 'aws-java-sdk-codedeploy', '1.10.11' )
 require_jar( 'com.amazonaws', 'aws-java-sdk-dynamodb', '1.10.10' )
 require_jar( 'com.amazonaws', 'aws-java-sdk-directconnect', '1.10.11' )
-require_jar( 'org.apache.httpcomponents', 'httpclient', '4.3.6' )
+require_jar( 'org.apache.httpcomponents', 'httpclient', '4.4.1' )
+require_jar( 'org.apache.httpcomponents', 'httpcore', '4.4.1' )
 require_jar( 'com.amazonaws', 'aws-java-sdk-sns', '1.10.11' )
 require_jar( 'com.amazonaws', 'aws-java-sdk-directory', '1.10.11' )
 require_jar( 'com.google.protobuf', 'protobuf-java', '2.6.1' )

lib/logstash/inputs/dynamodb.rb

@@ -182,17 +182,23 @@ def register
 
   public
   def run(logstash_queue)
-    begin
-      run_with_catch(logstash_queue)
-    rescue LogStash::ShutdownSignal
-      exit_threads
-      until @queue.empty?
-        @logger.info("Flushing rest of events in logstash queue")
-        event = @queue.pop()
-        queue_event(@parser.parse_stream(event), logstash_queue, @host)
-      end # until [email protected]?
-    end # begin
-  end # def run(logstash_queue)
+    $exit = false
+    run_with_catch(logstash_queue)
+    while !stop?
+      Stud.stoppable_sleep(@interval) { stop? }
+    end
+  end
+
+  public
+  def stop
+    $exit = true
+    exit_threads
+    until @queue.empty?
+      @logger.info("Flushing rest of events in logstash queue")
+      event = @queue.pop()
+      queue_event(@parser.parse_stream(event), logstash_queue, @host)
+    end # until [email protected]?
+  end
 
   # Starts KCL app in a background thread
   # Starts parallel scan if need be in a background thread
@@ -278,12 +284,16 @@ def scan(logstash_queue)
     start_table_copy_thread
 
     scan_queue = @logstash_writer.getQueue()
-    while true
-      event = scan_queue.take()
-      if event.getEntry().nil? and event.getSize() == -1
-        break
-      end # if event.isEmpty()
-      queue_event(@parser.parse_scan(event.getEntry(), event.getSize()), logstash_queue, @host)
+    while !$exit
+      if !scan_queue.empty?
+        event = scan_queue.take()
+        if event.getEntry().nil? and event.getSize() == -1
+          break
+        end # if event.isEmpty()
+        queue_event(@parser.parse_scan(event.getEntry(), event.getSize()), logstash_queue, @host)
+      else
+        sleep(1)
+      end
     end # while true
   end
 
@@ -292,14 +302,20 @@ def stream(logstash_queue)
     @logger.info("Starting stream...")
     start_kcl_thread
 
-    while true
-      event = @queue.pop()
-      queue_event(@parser.parse_stream(event), logstash_queue, @host)
+    while !$exit
+      if !@queue.empty?
+        event = @queue.pop()
+        queue_event(@parser.parse_stream(event), logstash_queue, @host)
+      else
+        sleep(1)
+      end
     end # while true
   end
 
   private
   def exit_threads
+    @worker.shutdown()
+
     unless @dynamodb_scan_thread.nil?
       @dynamodb_scan_thread.exit
     end # unless @dynamodb_scan_thread.nil?

logstash-input-dynamodb.gemspec

@@ -19,9 +19,11 @@ 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-codec-json"
+  s.add_runtime_dependency "logstash-core", ">= 2.0.0", "< 3.0.0"
+  s.add_runtime_dependency 'logstash-codec-json'
+  s.add_runtime_dependency 'stud', '>= 0.0.22'
   s.add_runtime_dependency "activesupport-json_encoder"
+  s.add_development_dependency 'logstash-devutils', '>= 0.0.16'
   # Jar dependencies
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-elasticbeanstalk', '1.10.11'"
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-ses', '1.10.11' "
@@ -37,7 +39,8 @@ Gem::Specification.new do |s|
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-codedeploy', '1.10.11'"
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-dynamodb', '1.10.10'"
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-directconnect', '1.10.11'"
-  s.requirements << "jar 'org.apache.httpcomponents:httpclient', '4.3.6'"
+  s.requirements << "jar 'org.apache.httpcomponents:httpclient', '4.4.1'"
+  s.requirements << "jar 'org.apache.httpcomponents:httpcore', '4.4.1'"
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-sns', '1.10.11'"
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-directory', '1.10.11'"
   s.requirements << "jar 'com.google.protobuf:protobuf-java', '2.6.1'"
@@ -95,6 +98,5 @@ Gem::Specification.new do |s|
   s.requirements << "jar 'com.amazonaws:aws-java-sdk-cloudwatch', '1.10.8'"
   s.add_runtime_dependency 'jar-dependencies'
   # Development dependencies
-  s.add_development_dependency "logstash-devutils"
   s.add_development_dependency "mocha"
 end