eventq_aws 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a746a11cfb986b33241456a37150d55f97bf8be4
-  data.tar.gz: 89c78c5683c4c0264a49225be079c7e0492441cb
+  metadata.gz: e15c0b3ea491947a4e5b4def3a7f51bc4d67931e
+  data.tar.gz: a7de217ebfaa2ff6fb60c9f3ed24502157a48342
 SHA512:
-  metadata.gz: d43772c05d712c0f0f5c39b3e3d18ea7fb2bf65662eb44b01a4b1f5e6c3944ce5a9817995af06c8c3bf99c914d33b410b1a6ca0f4b0cc4ef1fbc41a4c99334fe
-  data.tar.gz: 38ae0e8f13cc2fceceb07cc03cc1ae6dda1ac01e7f2bd5672512d943501e9e9a3a18294f844875d92679f7035407571ed337eff2c4f957c6ac70603ba3bad4e0
+  metadata.gz: 05c258c6081057650aacc7731d464f676bf6f0871938cb2316644948455289470b49ff57e3ed0210dbb59e41b701841919548bf2e778c98a2b7817061b06528a
+  data.tar.gz: f1f95c3991299bcc67177e3c5158a67fd616a275568e9ae295752047e1b75fc9d7becdc1a17af3d27220949cb80157abc202d597f5bae386868a6c9004df3e9c

data/lib/eventq_aws/aws_eventq_client.rb

@@ -79,10 +79,6 @@ module EventQ
         EventQ::QueueMessage.new
       end
 
-      def keep_alive(connections: 15, interval: 1.5)
-        @client.keep_alive(connections: connections, interval: interval)
-      end
-
       private
 
       def with_prepared_message(event_type, event, context)

data/lib/eventq_aws/aws_queue_client.rb

@@ -13,9 +13,6 @@ module EventQ
 
         @aws_account = options[:aws_account_number]
 
-        @sns_keep_alive_timeout = options[:sns_keep_alive_timeout] || 30
-        @sns_continue_timeout = options[:sns_continue_timeout] || 15
-
         if options.has_key?(:aws_region)
           @aws_region = options[:aws_region]
           Aws.config[:region] = @aws_region
@@ -31,10 +28,7 @@ module EventQ
 
       # Returns the AWS SNS Client
       def sns
-        @sns ||= Aws::SNS::Client.new(
-          http_idle_timeout: @sns_keep_alive_timeout,
-          http_continue_timeout: @sns_continue_timeout
-        )
+        @sns ||= Aws::SNS::Client.new
       end
 
       def get_topic_arn(event_type)
@@ -69,27 +63,6 @@ module EventQ
         return name[0..79].gsub(/[^a-zA-Z\d_\-]/,'')
       end
 
-      def keep_alive(connections: 15, interval: 1.5)
-        connections.times do
-          Thread.new do
-            while true do
-              begin
-                Seahorse::Client::NetHttp::ConnectionPool.pools.each do |cp|
-                  pool = cp.instance_variable_get(:@pool)
-                  pool.each do |k,v|
-                    cp.session_for(URI(k)) do |session|
-                      session.request(Net::HTTP::Get.new('/'))
-                    end
-                  end
-                end
-              rescue
-                # swallow error and do nothing
-              end
-              sleep interval
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/eventq_aws/aws_queue_worker.rb

@@ -49,17 +49,15 @@ module EventQ
         @forks = []
 
         if @fork_count > 1
-          @fork_count.times do
-            pid = fork do
-              start_process(options, queue, block)
+          Thread.new do
+            @fork_count.times do
+              pid = fork do
+                start_process(options, queue, block)
+              end
+              @forks.push(pid)
             end
-            @forks.push(pid)
-          end
-
-          if options.key?(:wait) && options[:wait] == true
             @forks.each { |pid| Process.wait(pid) }
           end
-
         else
           start_process(options, queue, block)
         end
@@ -82,7 +80,6 @@ module EventQ
         #loop through each thread count
         @thread_count.times do
           thr = Thread.new do
-
             client = options[:client]
             manager = EventQ::Amazon::QueueManager.new({ client: client })
 
@@ -107,16 +104,13 @@ module EventQ
               end
 
             end
-
           end
           @threads.push(thr)
-
         end
 
-        if options.key?(:wait) && options[:wait] == true
+        if (options.key?(:wait) && options[:wait] == true) || (options.key?(:fork_count) && options[:fork_count] > 1)
           @threads.each { |thr| thr.join }
         end
-
       end
 
       def gc_flush
@@ -138,7 +132,7 @@ module EventQ
 
         begin
 
-          #request a message from the queue
+          # request a message from the queue
           response = client.sqs.receive_message({
                                                     queue_url: q,
                                                     max_number_of_messages: 1,
@@ -346,17 +340,16 @@ module EventQ
       end
 
       def configure(queue, options = {})
-
         @queue = queue
 
-        #default thread count
+        # default thread count
         @thread_count = 5
         if options.key?(:thread_count)
           @thread_count = options[:thread_count]
         end
 
-        #default sleep time in seconds
-        @sleep = 5
+        # default sleep time in seconds
+        @sleep = 0
         if options.key?(:sleep)
           @sleep = options[:sleep]
         end
@@ -370,6 +363,7 @@ module EventQ
           @gc_flush_interval = options[:gc_flush_interval]
         end
 
+        @queue_poll_wait = 15
         if options.key?(:queue_poll_wait)
           @queue_poll_wait = options[:queue_poll_wait]
         end
@@ -377,9 +371,7 @@ module EventQ
         EventQ.logger.info("[#{self.class}] - Configuring. Process Count: #{@fork_count} | Thread Count: #{@thread_count} | Interval Sleep: #{@sleep} | GC Flush Interval: #{@gc_flush_interval} | Queue Poll Wait: #{@queue_poll_wait}.")
 
         return true
-
       end
-
     end
   end
 end

data/lib/eventq_aws/version.rb

@@ -2,6 +2,6 @@
 
 module EventQ
   module Amazon
-    VERSION = "1.16.1"
+    VERSION = "1.16.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventq_aws
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - vaughanbrittonsage
@@ -56,16 +56,16 @@ dependencies:
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: eventq_base
   requirement: !ruby/object:Gem::Requirement