fourkites-sqspoller 0.1.11 → 0.1.12.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWZlOWI3Y2UzNTg3MWJiYTkwNDU4MzlmYzVjNGRlNDFmYmE2ZTc3Mw==
+    MjI4OWU4OGRhYmU2ZWNlYTY5NTgxOTAzYWVjNGM5MTkzZWE4ODMwZA==
   data.tar.gz: !binary |-
-    YTZmNDkyMmQ2NWYzNzAyMTdjYTY5MDQxYzlkNzMzZDcxNjk0NmE1OQ==
+    YTJlM2VhYWVmNDMxZWE0NzRjYjg4MDM1ZmRlZTdkM2RkMmRmMWUxZA==
 SHA512:
   metadata.gz: !binary |-
-    YzQwYzEzYjg3OTE5ZjBlZWJmODU2OTczZmM3ZjhmYTI3MzVlZDZmZDg5NWUw
-    MDY4YzVmNDQ4OGQ0MzQ3NTY1ODJkMzI3MDM4NWNjODEyMTdmNGI0NmFjZmFh
-    YTY3NWI2OWVlMTZkYjZiODI3YzcxNjYyNmQyYzFlNjliODdlODU=
+    NDE4ZjMyZGQ3MWVmMjdlZmFmNWI4N2Y1NjU2M2VlNDYzOGI5MjRlZTg0NzU2
+    MGYyZjFlZjI1NTYwMzRjZGNiMzBjYWVjYWQ0YWExZTUyZjNiYThiNDM1OTAy
+    MjA0Mzc2MWM0MDFkYmE3ZGUyODJlZjM5ODk1MmRiNmZmYjQ0NGM=
   data.tar.gz: !binary |-
-    MTFmNGEzMGZjOTRhYmQ2Yzg3NmFjYzFlM2Q2ZGY1ZWZkMDUwZmJiYzQxOTZm
-    ZGMyMjE1OWY4NTM0NmRiYTQ4MTBhMWNhYjNiYmRkYmU4Y2ZlYWJjNjNjOWU1
-    NDNlYWZmZDNkMjhjN2U2NWFlOWYwZDg5YzI1NTBiMjk1NTg1OTM=
+    Zjc2YTcyNzZhYjIwMTcxYWQzMTZmODlhMzM4NGQyNWE1NDY2NmM4OGIwOWZl
+    M2I4MzhkMjIxZDYyM2FjZmZhZDBhMTk3MzNmNmZjNTlmNzVhNjVjMTFjZDFi
+    ZWI0YTJhZGVhMTc0NzVkZDU2MDJiZjRlNjllODJjMTgwNTI0NTM=

data/bin/sqspoller

@@ -1,5 +1,4 @@
 #!/opt/rubies/ruby-2.2.2/bin/ruby
-
 require 'sqspoller'
 
 
@@ -7,5 +6,6 @@ puts "SQSPoller arguments check"
 ARGV.each do |arg|
   puts "arg: #{arg}"
 end
-
-Sqspoller::SqsPoller.start_poller ARGV[0], ARGV[1], ARGV[2], ARGV[3], ARGV[4]
+puts "Starting poller"
+Sqspoller::SqsPoller.start_poller ARGV[0], ARGV[1], ARGV[2], ARGV[3], ARGV[4], ARGV[5]
+puts "poller done"

data/lib/sqspoller/message_delegator.rb

@@ -19,7 +19,7 @@ module Sqspoller
       @connection_pool = Concurrent::RubyThreadPoolExecutor.new(max_threads: @worker_thread_pool_size, min_threads: 1, max_queue: @max_allowed_queue_size)
     end
 
-    def process(message, message_id)
+    def process(queue_controller, message, queue_name)
       @semaphore.synchronize {
         @pending_schedule_tasks +=1
         if @connection_pool.queue_length == @max_allowed_queue_size
@@ -29,23 +29,22 @@ module Sqspoller
         end
       }
       begin
-        @logger.info "Scheduling worker task for message: #{message_id}"
+        @logger.info "Scheduling worker task for queue: #{queue_name}, message: #{message.message_id}"
 
         @connection_pool.post do
           begin
-            @logger.info "Starting worker task for message: #{message_id}"
-            @worker_task.process(message, message_id)
+            @logger.info "Starting worker task for queue: #{queue_name}, message: #{message.message_id}"
+            @worker_task.process(message.body, message.message_id)
             @pending_schedule_tasks -= 1
-            @logger.info "Finished worker task for message: #{message_id}"
+            @logger.info "Finished worker task for queue: #{queue_name}, message: #{message.message_id}"
+            queue_controller.delete_message message.receipt_handle
           rescue Exception => e
             @pending_schedule_tasks -= 1
-            @logger.info "Caught error #{e.message}"
-            raise :skip_delete
+            @logger.info "Caught error for message: #{message}, error: #{e.message}, #{e.backtrace.join("\n")}"
           end
         end
       rescue Concurrent::RejectedExecutionError => e
-        @logger.info  "Caught Concurrent::RejectedExecutionError #{e.message}"
-        raise :skip_delete
+        @logger.info  "Caught Concurrent::RejectedExecutionError for #{e.message}"
       end
     end
   end

data/lib/sqspoller/queue_controller.rb

@@ -33,17 +33,26 @@ module Sqspoller
         @logger.info "Poller thread started for queue: #{queue_url}"
         poller = Aws::SQS::QueuePoller.new(queue_url)
 
-        poller.poll do |received_message|
-          begin
-            @logger.info "Received message #{received_message.message_id}"
-            @task_delegator.process received_message.body, received_message.message_id
-          rescue Exception => e
-            puts "Encountered error, will not delete message. #{received_message.message_id}"
-            throw :skip_delete
-          end
+        while true
+          msgs = @sqs.receive_message :queue_url => queue_url
+          msgs.messages.each { |received_message|
+            begin
+              @logger.info "Received message #{received_message.message_id}"
+              @task_delegator.process self, received_message, @queue_name
+            rescue Exception => e
+              @logger.info "Encountered error #{e.message} while submitting message from queue #{queue_url}"
+            end
+          }
         end
       end
     end
 
+    def delete_message(receipt_handle)
+      @sqs.delete_message(
+        queue_url: @queue_details.queue_url,
+        receipt_handle: receipt_handle
+      )
+    end
+
   end
 end

data/lib/sqspoller/worker_task.rb

@@ -15,16 +15,24 @@ module Sqspoller
     end
 
     def process(message, message_id)
+      params = {}
+      parsed_message = JSON.parse(message)
+      parsed_message.keys.each do |key|
+        puts "Creating a new params hash"
+        params[key] = ( parsed_message[key].is_a?(Hash) ? parsed_message[key].to_json : parsed_message[key])
+      end
       if @http_method.downcase == "post"
-        response = Net::HTTP.post_form(@uri, JSON.parse(message))
+        response = Net::HTTP.post_form(@uri, JSON.parse(params))
       elsif @http_method.downcase == "get"
         uri = URI(@http_url)
-        uri.query = URI.encode_www_form(JSON.parse(message))
+        uri.query = URI.encode_www_form(JSON.parse(params))
         response = Net::HTTP.get_response(uri)
       else
         raise "Invalid http_method provided. #{http_method}"
       end
-      @logger.info "Got HTTP response as #{response.code}, #{response.body}"
+      if response.code.to_s != '200'
+        raise "Service did not return 200 OK response. #{response.code}"
+      end
     end
   end
 

data/sqspoller.gemspec

@@ -5,7 +5,7 @@ require 'sqspoller/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "fourkites-sqspoller"
-  spec.version       = '0.1.11'
+  spec.version       = '0.1.12.10'
   spec.authors       = ["anshul-fk"]
   spec.email         = ["anshul@fourkites.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fourkites-sqspoller
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12.10
 platform: ruby
 authors:
 - anshul-fk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,8 +84,6 @@ description: ''
 email:
 - anshul@fourkites.com
 executables:
-- console
-- setup
 - sqspoller
 extensions: []
 extra_rdoc_files: []
@@ -96,8 +94,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - bin/sqspoller
 - lib/sqspoller.rb
 - lib/sqspoller/message_delegator.rb

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "sqspoller"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/setup

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here