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

@@ -184,7 +184,8 @@ def register
   def run(logstash_queue)
     begin
       run_with_catch(logstash_queue)
-    rescue LogStash::ShutdownSignal
+    end
+    if stop?
       exit_threads
       until @queue.empty?
         @logger.info("Flushing rest of events in logstash queue")
@@ -278,7 +279,7 @@ def scan(logstash_queue)
     start_table_copy_thread
 
     scan_queue = @logstash_writer.getQueue()
-    while true
+    while !stop?
       event = scan_queue.take()
       if event.getEntry().nil? and event.getSize() == -1
         break
@@ -292,7 +293,7 @@ def stream(logstash_queue)
     @logger.info("Starting stream...")
     start_kcl_thread
 
-    while true
+    while !stop?
       event = @queue.pop()
       queue_event(@parser.parse_stream(event), logstash_queue, @host)
     end # while true

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'"