skyrunner 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a2ced9a38b36395ef00e5eacfb9d6ff57711f06
-  data.tar.gz: 95ec876e3a8e95eca0498b451ae677ef390a1e11
+  metadata.gz: 49176f855293135111d70129a79f8f6099d775f6
+  data.tar.gz: fe7cb68a221e708c668e49f950161f4db9d67542
 SHA512:
-  metadata.gz: d5ad890cdaa3a625f0056587a18f56601c2ac5d9a9039a5151805ee109ad2f4c19b79dadc9637790bb1eaee70f681ad20c3cc8ce9f6208bcb0c8053479b571f0
-  data.tar.gz: d05d068716f2c988700810eed2083bc18f940135ec5fcada0e5c275723b13f53dff9970e7eba791c096160635df529be8249c1b14d8f3c7b621a17c902d0a16b
+  metadata.gz: ff7a55a80f9a5710ddddcec9b0df187d098557667e49db60c6a90386b7e006b9b08437cb02dd4791396169acc378d44dcf0bc633c582b11f6b62f751fd779538
+  data.tar.gz: 1df498dd88128acb06800004a76208292881c10e372d180cb2d7f38ef28cb7d8860821aa1f30ee11eaf28971bf2f35159fc7471b0734512d15eaf44cda0099b0

data/bin/skyrunner

@@ -32,14 +32,12 @@ opts = Trollop::options do
 
   opt :dynamo_db_table_name, "DynamoDB table to use for job state.", default: "skyrunner_jobs", type: :string
   opt :sqs_queue_name, "SQS queue use for tasks.", default: "skyrunner_tasks", type: :string
-  opt :namespace, "Namespace of jobs to consume.", default: "default", type: :string
   opt :batch_size, "Number of tasks to consume per batch.", default: 10
   opt :num_threads, "Number of consumer threads.", default: 10
 end
 
 SkyRunner.dynamo_db_table_name = opts[:dynamo_db_table_name]
 SkyRunner.sqs_queue_name = opts[:sqs_queue_name]
-SkyRunner.job_namespace = opts[:namespace]
 SkyRunner.consumer_batch_size = opts[:batch_size].to_i
 SkyRunner.num_threads = opts[:num_threads].to_i
 
@@ -59,6 +57,6 @@ when "consume"
 when "test"
   $: << "."
   require "#{File.dirname(__FILE__)}/../jobs/example_job"
-  ExampleJobModule::ExampleJob.new.execute!(number_of_tasks: 500)
+  ExampleJobModule::ExampleJob.new.execute!(number_of_tasks: 100)
   SkyRunner.consume!
 end

data/lib/generators/sky_runner/install/templates/skyrunner.rb

@@ -5,9 +5,6 @@ SkyRunner.setup do |config|
   config.dynamo_db_table_name = "skyrunner_jobs_#{Rails.env}"
   config.sqs_queue_name = "skyrunner_tasks_#{Rails.env}"
 
-  # Customzie this to change the namespace of jobs enqueued and consumed by this application.
-  config.job_namespace = Rails.application.class.parent_name.underscore
-
   # Set the number of tasks for a consumer to pull and run from SQS at a time. (Max 10, default 10)
   #
   # config.consumer_batch_size = 10

data/lib/skyrunner/job.rb

@@ -34,7 +34,7 @@ module SkyRunner::Job
     table = SkyRunner.dynamo_db_table
     queue = SkyRunner.sqs_queue
 
-    record = table.items.put(job_id: job_id, namespace: SkyRunner.job_namespace, class: self.class.name, args: args.to_json, total_tasks: 1, completed_tasks: 0, done: 0, failed: 0)
+    record = table.items.put(job_id: job_id, class: self.class.name, args: args.to_json, total_tasks: 1, completed_tasks: 0, done: 0, failed: 0)
 
     pending_args = []
 

data/lib/skyrunner/version.rb

@@ -1,3 +1,3 @@
 module Skyrunner
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/skyrunner.rb

@@ -74,7 +74,7 @@ module SkyRunner
     1.upto(SkyRunner::num_threads) do
       threads << Thread.new do
         loop do
-          break if SkyRunner::stop_consuming? && local_queue.size == 0
+          break if SkyRunner::stop_consuming? && local_queue.empty?
 
           sleep 1 unless local_queue.size > 0
 
@@ -116,24 +116,24 @@ module SkyRunner
 
       received_messages = []
 
-      queue.receive_messages(limit: [1, [SkyRunner.consumer_batch_size, SQS_MAX_BATCH_SIZE].min].max, wait_time_seconds: 5) do |message|
+      batch_size = [1, [SkyRunner.consumer_batch_size, SQS_MAX_BATCH_SIZE].min].max
+
+      queue.receive_messages(limit: batch_size, wait_time_seconds: 5) do |message|
         received_messages << [message, JSON.parse(message.body)]
       end
 
       next unless received_messages.size > 0
 
       table.batch_get(:all, received_messages.map { |m| m[1]["job_id"] }.uniq, consistent_read: true) do |record|
-        received_messages.select { |m| m[1]["job_id"] == record["job_id"] }.each_with_index do |received_message|
-          message = received_message[1]
-          job_id = message["job_id"]
-
-          if record["namespace"] == SkyRunner.job_namespace && record["failed"] == 0 && error_queue.size == 0
-            start_time = Time.now
+        received_messages.select { |m| m[1]["job_id"] == record["job_id"] }.each do |received_message|
+          message, message_data = received_message
+          job_id = message_data["job_id"]
 
+          if record["failed"] == 0 && error_queue.empty?
             begin
               klass = Kernel.const_get(record["class"])
-              task_args = message["task_args"]
-              local_queue.push([klass, job_id, task_args, received_message[0]])
+              task_args = message_data["task_args"]
+              local_queue.push([klass, job_id, task_args, message])
             rescue NameError => e
               log :error, "Task Failed: No such class #{record["class"]} #{e.message}"
               yield e if block_given?
@@ -143,7 +143,7 @@ module SkyRunner
       end
     end
 
-    threads.each { |t| t.join }
+    threads.each(&:join)
 
     true
   end
@@ -184,9 +184,6 @@ module SkyRunner
   mattr_accessor :sqs_message_retention_period
   @@sqs_message_retention_period = 345600
 
-  mattr_accessor :job_namespace
-  @@job_namespace = "default"
-
   mattr_accessor :consumer_batch_size
   @@consumer_batch_size = 10
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skyrunner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Greg Fodor