osbourne 1.1.6 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0601b6c1105b1ee73019fd9d0776cc1dce5cf02370c84120780be45344c17c68
-  data.tar.gz: 771b77ff9768e57d92cce22ca7b9aa79aaf60a4772b8cc009efb04d4593f28ca
+  metadata.gz: 4cc955a9e0ea8360e5f14cb22de9f7d48c56b0607a66652bfe0410a712b7d17d
+  data.tar.gz: 605a96f1cd91e57a572fb235c4e1e95d75a37d31b776dce4870658d300cb2f15
 SHA512:
-  metadata.gz: ab8b46e9adbb97518e776a16cd488997a446ab1ce9b3e6504bf3a24e5d8a5d51a0e4d036c1d0f14ae366c4389b78cc0ce37a01ce7166411d92d1ad91ef94c03f
-  data.tar.gz: 158fa1e740d28ac8a14ca3a506a7ef6da7d6e3b4d877baf378ca06b0b869fe2aec40ddd9c8e5080bf05c79b4f63d54708bf2bc3aaeb5990531c089c27b576f16
+  metadata.gz: a74fc022d08f297ff54e6aff4192fa8126a4f93d96ee8118faec2a1f21f046deb12e4d4c272cfc863460d9efcff41262671f34948c73a94d6c3cf9ac1cd09f48
+  data.tar.gz: 97f79d13c2b3440f8528fdd767e537f0fdc1ae5f6a61cd2dbd9129d97920b5ae7c80b819c1a0e69e44755f9c07e2795b9d759cdf12ad78395e66b0139c9a5633

data/lib/osbourne/launcher.rb

@@ -30,7 +30,12 @@ module Osbourne
     def global_polling_threads
       Osbourne::WorkerBase.descendants.map do |worker|
         Osbourne.logger.debug("[Osbourne] Spawning thread for #{worker.name}")
-        Thread.new { poll(worker) }
+        Thread.new do
+          loop do
+            poll(worker)
+            break if @stop
+          end
+        end
       end
     end
 
@@ -45,28 +50,27 @@ module Osbourne
     def poll(worker)
       worker.polling_queue.poll(wait_time_seconds:      worker.config[:max_wait_time],
                                 max_number_of_messages: worker.config[:max_batch_size],
+                                idle_timeout:           worker.config[:idle_timeout],
                                 skip_delete:            true) do |messages|
         Osbourne.logger.debug("[Osbourne] Recieved #{messages.count} on #{worker.name}")
-        messages.map do |msg|
-          worker.polling_queue.delete_message(msg) if process(worker, Osbourne::Message.new(msg))
-        end
-        Osbourne.logger.debug("[Osbourne] Waiting for more messages on #{worker.name} for max of #{worker.config[:max_wait_time]} seconds")
+        Array(messages).each {|msg| process(worker, Osbourne::Message.new(msg)) }
         throw :stop_polling if @stop
+        Osbourne.logger.debug("[Osbourne] Waiting for more messages on #{worker.name} for max of #{worker.config[:max_wait_time]} seconds")
       end
     end
 
     private
 
-    def process(worker, message)
+    def process(worker, message) # rubocop:disable Metrics/AbcSize
       Osbourne.logger.info("[Osbourne] [MSG] Worker: #{worker.name} Valid: #{message.valid?} ID: #{message.id}")
       return false unless message.valid? && Osbourne.lock.soft_lock(message.id)
 
       Osbourne.cache.fetch(message.id, ex: 24.hours) do
         worker.new.process(message).tap {|_| Osbourne.lock.unlock(message.id) }
       end
+      worker.polling_queue.delete_message(message.message)
     rescue Exception => ex # rubocop:disable Lint/RescueException
       Osbourne.logger.error("[Osbourne] [MSG ID: #{message.id}] [#{ex.message}]\n #{ex.backtrace_locations.join("\n")}")
-      false
     end
   end
 end

data/lib/osbourne/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osbourne
-  VERSION = "1.1.6"
+  VERSION = "1.2"
 end

data/lib/osbourne/worker_base.rb

@@ -79,6 +79,7 @@ module Osbourne
                         threads: Osbourne.threads_per_worker,
                         queue_name: default_queue_name,
                         dead_letter_queue: true,
+                        idle_timeout: 600,
                         max_retry_count: Osbourne.max_retry_count)
         self.config = {
           topic_names:     Array(topics),
@@ -87,7 +88,8 @@ module Osbourne
           max_wait:        max_wait,
           threads:         threads,
           dead_letter:     dead_letter_queue,
-          max_retry_count: max_retry_count
+          max_retry_count: max_retry_count,
+          idle_timeout:    idle_timeout
         }
       end
       # rubocop:enable Metrics/ParameterLists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: osbourne
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: '1.2'
 platform: ruby
 authors:
 - Steve Allen