fk-redis-sqspoller 0.1.2.5.7 → 0.1.2.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf6481762f4e23ed9df6865c38f850de661d68a
-  data.tar.gz: e5820a9b4d7c0ab6d5ef578d3e89a9811215913b
+  metadata.gz: e0e92e9a52260863c748a9cad310da796f8f6fde
+  data.tar.gz: 10eebb3ff570277f5c0fa3aa1b03cbd20dc7539a
 SHA512:
-  metadata.gz: aaf50cd5b65cb1bcd45cef47db374ec5dcf8b1a44243752ae2dba6c58a7f3a095f6aa661809c38258b1c45aaa9593472a2235046a9ca109484533b5b132f7808
-  data.tar.gz: c62db3248c3105dd81df9b0412492f7514df5b1f582ce48b5aafcc71518ea2786dee9e5f73f45b6f72b8d48945483000f990cc6b4b30515d1086d95628aa14c3
+  metadata.gz: 829efb6fd1df2c31b3677fb7297e2657f74a9b9b521697a3ca79fbd27a98ba8a93736c5a5a6fe123c75d6248f76f845e00cc508332231c3c0fe317c25012b143
+  data.tar.gz: 03b3953eb5a384405d70987b6519200948cb0d817fb93dcfae47d7013cedad9d4d023e9732edd05df1096dff0e8b2cd0d9af9be0b884b54feb1e61aa96989e11

data/example_config.yml

@@ -7,9 +7,6 @@ worker_configuration:
 staging-queues:
   staging-outbound-messages_company-name-1:
     polling_threads: 1
-  staging-outbound-messages_company-shadow-queue-name-1:
-    polling_threads: 1
-    sns_topic_arn: "arn:aws:sns:us-east-1:723008196684:blackhole"
   staging-outbound-messages_company-name-2:
     polling_threads: 1
   staging-outbound-messages_company-name-3:

data/lib/sqspoller/sqs_poller.rb

@@ -99,26 +99,14 @@ module Sqspoller
       end
 
       def start_queues_with_config poller_args
-        @logger_file = poller_args[:log_filename]
-        @logger = Logger.new(@logger_file)
-        poller_args[:logger_file] = @logger_file
+        @logger = Logger.new(poller_args[:log_filename])
         poller_args[:logger] = @logger
         @logger.info "Starting version: #{VERSION}"
         @logger.info "Get config"
         config = if poller_args[:redis_or_file]
-                   begin
-                     load_config_from_redis poller_args[:content_name]
-                   rescue
-                     @logger.error "Unable to load config from Redis key #{poller_args[:content_name]}"
-                     {}
-                   end
+                   load_config_from_redis poller_args[:content_name]
                  else
-                   begin
-                     load_config_from_file poller_args[:content_name]
-                   rescue
-                     @logger.error "Unable to load config from file named #{poller_args[:content_name]}"
-                     {}
-                   end
+                   load_config_from_file poller_args[:content_name]
                  end
         @logger.info "Config: #{config.inspect}"
         queues_config = config[poller_args[:queue_config_name]]
@@ -130,22 +118,16 @@ module Sqspoller
 
         @logger.info "Started poller method"
 
-        worker_config = config[:worker_configuration].merge(poller_args)
-        total_poller_threads = worker_pool_init worker_config, queues_config, poller_args[:log_filename]
-
-        # keep track of default delegator and queue specific delegators
-        @delegator = {}
-        @delegator.default = initialize_worker worker_config, total_poller_threads, @logger_file
+        message_delegator = worker_pool_init config[:worker_configuration].merge(poller_args), queues_config, poller_args[:log_filename]
 
         if poller_args[:redis_or_file]
-          refresh_interval = config[:worker_configuration][:refresh_interval_in_seconds] || 3600
-          start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval, worker_config, total_poller_threads
+          start_all_queues_with_refresh queues_config, message_delegator, poller_args, config[:worker_configuration][:refresh_interval_in_seconds] || 3600
         else
           start_all_queues  queues_config, message_delegator, poller_args
         end
       end
 
-      def start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval, worker_config
+      def start_all_queues_with_refresh queues_config, message_delegator, poller_args, refresh_interval
         @logger.info "Start all queues with refresh"
         queues = {}
         loop do
@@ -157,14 +139,10 @@ module Sqspoller
                 @logger.info "      Queue: #{queue} not created, already initialized and running"
               else
                 @logger.info "      Queue: #{queue} previously created, however not all threads are running. Restarting."
-                queues[queue] = start_queue_controller queues_config, queue, @delegator['queue'], poller_args
+                queues[queue] = start_queue_controller queues_config, queue, message_delegator, poller_args
               end
             else
-              if queues_config['sns_topic_arn']
-                worker_config['sns_topic_arn'] = queues_config['sns_topic_arn']
-                @delegator['queue'] = initialize_worker worker_config, @total_poller_threads, @logger_file
-              end
-              queues[queue] = start_queue_controller queues_config, queue, @delegator['queue'], poller_args
+              queues[queue] = start_queue_controller queues_config, queue, message_delegator, poller_args
             end
           end
           @logger.info "  Done creating queues, sleeping for #{refresh_interval} seconds"
@@ -187,6 +165,7 @@ module Sqspoller
         total_poller_threads = queues_config.keys.reduce(0) do |sum, queue|
                                  sum += queues_config[queue][:polling_threads]
                                end
+        initialize_worker worker_config, total_poller_threads, logger_file
       end
 
       def start_queue_controller queues_config, queue, message_delegator, poller_args

data/lib/sqspoller/version.rb

@@ -1,3 +1,3 @@
 module Sqspoller
-  VERSION = "0.1.2.5.7"
+  VERSION = "0.1.2.5.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fk-redis-sqspoller
 version: !ruby/object:Gem::Version
-  version: 0.1.2.5.7
+  version: 0.1.2.5.8
 platform: ruby
 authors:
 - FourKites
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler