osbourne 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc30cb744a8d1f61944e06d22366941ac38cb47a403b7326bcae0d42675354b
-  data.tar.gz: 763818934b5e711f4d490c79a5e0c23ac9be6cbd405db01d2ff84d566bc89965
+  metadata.gz: 0601b6c1105b1ee73019fd9d0776cc1dce5cf02370c84120780be45344c17c68
+  data.tar.gz: 771b77ff9768e57d92cce22ca7b9aa79aaf60a4772b8cc009efb04d4593f28ca
 SHA512:
-  metadata.gz: a4747c0fc40a18ec8f4c09dd1bb6f524642d6237f595bf2467313d39dc650886a292e0c546cef3f2ea68c1bb7d360b9336ce24fcec16315dd8a2d4c413b275fc
-  data.tar.gz: fa40de44493aa86981222b685da16e9a291e07906a6d743b5e0d85572dee996d502bd6bd75ead9f9d1d5e59036374bf0ab66d56b6d6496f1db2e2cafd9deb03e
+  metadata.gz: ab8b46e9adbb97518e776a16cd488997a446ab1ce9b3e6504bf3a24e5d8a5d51a0e4d036c1d0f14ae366c4389b78cc0ce37a01ce7166411d92d1ad91ef94c03f
+  data.tar.gz: 158fa1e740d28ac8a14ca3a506a7ef6da7d6e3b4d877baf378ca06b0b869fe2aec40ddd9c8e5080bf05c79b4f63d54708bf2bc3aaeb5990531c089c27b576f16

data/lib/osbourne/launcher.rb

@@ -8,7 +8,7 @@ module Osbourne
     def initialize; end
 
     def start!
-      Osbourne.logger.info("Launching Osbourne workers")
+      Osbourne.logger.info("[Osbourne] Launching Osbourne workers")
       @stop = false
       @threads = global_polling_threads
     end
@@ -29,7 +29,7 @@ module Osbourne
 
     def global_polling_threads
       Osbourne::WorkerBase.descendants.map do |worker|
-        Osbourne.logger.debug("Spawning thread for #{worker.name}")
+        Osbourne.logger.debug("[Osbourne] Spawning thread for #{worker.name}")
         Thread.new { poll(worker) }
       end
     end
@@ -46,9 +46,11 @@ module Osbourne
       worker.polling_queue.poll(wait_time_seconds:      worker.config[:max_wait_time],
                                 max_number_of_messages: worker.config[:max_batch_size],
                                 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")
         throw :stop_polling if @stop
       end
     end
@@ -56,14 +58,14 @@ module Osbourne
     private
 
     def process(worker, message)
-      Osbourne.logger.info("[MSG] Worker: #{worker.name} Valid: #{message.valid?} ID: #{message.id}")
+      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
     rescue Exception => ex # rubocop:disable Lint/RescueException
-      Osbourne.logger.error("[MSG ID: #{message.id}] [#{ex.message}]\n #{ex.backtrace_locations.join("\n")}")
+      Osbourne.logger.error("[Osbourne] [MSG ID: #{message.id}] [#{ex.message}]\n #{ex.backtrace_locations.join("\n")}")
       false
     end
   end

data/lib/osbourne/message.rb

@@ -53,7 +53,7 @@ module Osbourne
 
     def delete
       message.delete
-      Osbourne.logger.info "[MSG ID: #{id}] Cleared"
+      Osbourne.logger.info "[Osbourne] [MSG ID: #{id}] Cleared"
     end
 
     ##

data/lib/osbourne/queue.rb

@@ -3,9 +3,10 @@
 module Osbourne
   class Queue
     include Services::SQS
-    attr_reader :name
+    attr_reader :name, :prefixed_name
     def initialize(name)
       @name = name
+      @prefixed_name = Osbourne.prefixer(@name)
       arn
     end
 
@@ -30,9 +31,9 @@ module Osbourne
     private
 
     def ensure_queue
-      Osbourne.logger.debug "Ensuring queue `#{name}` exists"
-      Osbourne.cache.fetch("osbourne_url_for_#{name}") do
-        sqs.create_queue(queue_name: name).queue_url
+      Osbourne.logger.debug "[Osbourne] Ensuring queue `#{@prefixed_name}` exists"
+      Osbourne.cache.fetch("osbourne_url_for_#{@prefixed_name}") do
+        sqs.create_queue(queue_name: @prefixed_name).queue_url
       end
     end
 

data/lib/osbourne/runner.rb

@@ -47,38 +47,38 @@ module Osbourne
     private
 
     def execute_soft_shutdown
-      Osbourne.logger.info { "Received USR1, will soft shutdown down" }
+      Osbourne.logger.info { "[Osbourne] Received USR1, will soft shutdown down" }
 
       @launcher.stop
       exit 0
     end
 
     def execute_terminal_stop
-      Osbourne.logger.info { "Received TSTP, will stop accepting new work" }
+      Osbourne.logger.info { "[Osbourne] Received TSTP, will stop accepting new work" }
 
       @launcher.stop!
     end
 
     def print_threads_backtrace
       Thread.list.each do |thread|
-        Osbourne.logger.info { "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}" }
+        Osbourne.logger.info { "[Osbourne] Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}" }
         if thread.backtrace
           Osbourne.logger.info { thread.backtrace.join("\n") }
         else
-          Osbourne.logger.info { "<no backtrace available>" }
+          Osbourne.logger.info { "[Osbourne] <no backtrace available>" }
         end
       end
     end
 
     def handle_signal(sig)
-      Osbourne.logger.debug "Got #{sig} signal"
+      Osbourne.logger.debug "[Osbourne] Got #{sig} signal"
 
       case sig
       when "USR1" then execute_soft_shutdown
       when "TTIN" then print_threads_backtrace
       when "TSTP" then execute_terminal_stop
       when "TERM", "INT"
-        Osbourne.logger.info { "Received #{sig}, will shutdown" }
+        Osbourne.logger.info { "[Osbourne] Received #{sig}, will shutdown" }
 
         raise Interrupt
       end

data/lib/osbourne/services/queue_provisioner.rb

@@ -7,8 +7,8 @@ module Osbourne
         Dir[File.expand_path("app/workers/**/*.rb")].each {|f| require f }
         return if Osbourne.test_mode?
 
-        Osbourne.logger.info "Workers found: #{Osbourne::WorkerBase.descendants.map(&:name).join(', ')}"
-        Osbourne.logger.info "Provisioning queues for all workers"
+        Osbourne.logger.info "[Osbourne] Workers found: #{Osbourne::WorkerBase.descendants.map(&:name).join(', ')}"
+        Osbourne.logger.info "[Osbourne] Provisioning queues for all workers"
         Osbourne::WorkerBase.descendants.each(&:provision)
       end
     end

data/lib/osbourne/subscription.rb

@@ -19,16 +19,16 @@ module Osbourne
     end
 
     def subscribe(topic)
-      Osbourne.logger.info("Checking subscription for #{queue.name} to #{topic.name}")
+      Osbourne.logger.info("[Osbourne] Checking subscription for #{queue.prefixed_name} to #{topic.prefixed_name}")
       return if Osbourne.existing_subscriptions_for(topic).include? queue.arn
 
-      Osbourne.logger.info("Subscribing #{queue.name} to #{topic.name}")
+      Osbourne.logger.info("[Osbourne] Subscribing #{queue.prefixed_name} to #{topic.prefixed_name}")
       sns.subscribe(topic_arn: topic.arn, protocol: "sqs", endpoint: queue.arn).subscription_arn
       Osbourne.clear_subscriptions_for(topic)
     end
 
     def set_queue_policy
-      Osbourne.logger.info("Setting policy for #{queue.name} (attributes: #{build_policy})")
+      Osbourne.logger.info("[Osbourne] Setting policy for #{queue.prefixed_name} (attributes: #{build_policy})")
       sqs.set_queue_attributes(queue_url: queue.url, attributes: build_policy)
     end
 
@@ -37,7 +37,7 @@ module Osbourne
       {
         "Policy" => {
           "Version"   => "2012-10-17",
-          "Id"        => "Osbourne/#{queue.name}/SNSPolicy",
+          "Id"        => "Osbourne/#{queue.prefixed_name}/SNSPolicy",
           "Statement" => topics.map {|t| build_policy_statement(t) }
         }.to_json
       }
@@ -45,7 +45,7 @@ module Osbourne
 
     def build_policy_statement(topic)
       {
-        "Sid"       => "Sid#{topic.name}",
+        "Sid"       => "Sid#{topic.prefixed_name}",
         "Effect"    => "Allow",
         "Principal" => {"AWS" => "*"},
         "Action"    => "SQS:SendMessage",

data/lib/osbourne/test/mock_pubsub.rb

@@ -6,11 +6,11 @@ module Osbourne
     class MockPubsub
       class << self
         def mock_publish(topic, message)
-          prefixed_topic = Osbourne.prefixer(topic)
+          # prefixed_topic = Osbourne.prefixer(topic)
           parsed_message = parse(message)
           Osbourne::WorkerBase.descendants.each do |worker|
-            msg = Osbourne::Test::Message.new(topic: prefixed_topic, body: parsed_message)
-            worker.new.process(msg) if worker.config[:topic_names].include? prefixed_topic
+            msg = Osbourne::Test::Message.new(topic: topic, body: parsed_message)
+            worker.new.process(msg) if worker.config[:topic_names].include? topic
           end
         end
 

data/lib/osbourne/topic.rb

@@ -19,7 +19,7 @@ module Osbourne
       parsed_message = parse(message)
       return if Osbourne.test_mode?
 
-      Osbourne.logger.info "[PUB] TOPIC: `#{prefixed_name}` MESSAGE: `#{parsed_message}`"
+      Osbourne.logger.info "[Osbourne] [PUB] TOPIC: `#{prefixed_name}` MESSAGE: `#{parsed_message}`"
       sns.publish(topic_arn: arn, message: parsed_message)
     end
 
@@ -28,7 +28,7 @@ module Osbourne
     def ensure_topic
       return if Osbourne.test_mode?
 
-      Osbourne.logger.debug "Ensuring topic `#{prefixed_name}` exists"
+      Osbourne.logger.debug "[Osbourne] Ensuring topic `#{prefixed_name}` exists"
       Osbourne.cache.fetch("osbourne_existing_topic_arn_for_#{prefixed_name}", ex: 1.minute) do
         sns.create_topic(name: prefixed_name).topic_arn
       end

data/lib/osbourne/version.rb

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

data/lib/osbourne/worker_base.rb

@@ -53,12 +53,12 @@ module Osbourne
       def register_dead_letter_queue
         return unless config[:dead_letter]
 
-        Osbourne.logger.info "#{self.class.name} dead letter queue: arn: [#{dead_letter_queue.arn}], max retries: #{config[:max_retry_count]}" # rubocop:disable Metrics/LineLength
+        Osbourne.logger.info "[Osbourne] #{self.class.name} dead letter queue: arn: [#{dead_letter_queue.arn}], max retries: #{config[:max_retry_count]}"
         queue.redrive(config[:max_retry_count], dead_letter_queue.arn)
       end
 
       def register
-        Osbourne.logger.info "#{self.class.name} subscriptions: Topics: [#{config[:topic_names].join(', ')}], Queue: [#{config[:queue_name]}]" # rubocop:disable Metrics/LineLength
+        Osbourne.logger.info "[Osbourne] #{self.class.name} subscriptions: Topics: [#{config[:topic_names].join(', ')}], Queue: [#{config[:queue_name]}]"
         self.topics = config[:topic_names].map {|tn| Topic.new(tn) }
         self.queue = Queue.new(config[:queue_name])
         self.subscriptions = Subscription.new(topics, queue)
@@ -81,8 +81,8 @@ module Osbourne
                         dead_letter_queue: true,
                         max_retry_count: Osbourne.max_retry_count)
         self.config = {
-          topic_names:     Array(topics).map {|tp| Osbourne.prefixer(tp) },
-          queue_name:      Osbourne.prefixer(queue_name),
+          topic_names:     Array(topics),
+          queue_name:      queue_name,
           max_batch_size:  max_batch_size,
           max_wait:        max_wait,
           threads:         threads,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osbourne
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Steve Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.37'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '3.37'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -71,7 +71,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="