fanforce-workers 0.7.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDA4NWQzYTRhN2U4NzUwZjM3MzZjYzFhY2Y5YmVhOTczMWMwMjQ3Zg==
+    MzE2YjI1YjljN2E4ZGQ0ZDA1YTY4ODlmZjZkNjMzZDM0MzQ3ODE2Mw==
   data.tar.gz: !binary |-
-    ZTU0YTNmZTk5NjQ3YWJkZGI0ZmVjZDRmOTc0NWI2ZTEzZjM1MDkwOA==
+    ZjFmZTc3ZmIyMjM5YjM2MWIxNjg0ZjIyMTliNGQzNjg1YzdmMzI5ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTViZjRmNjkzNDU1OTkzODIyY2M3Mjk5ZjAzMWRjNWM3OGY5ZDUyNWQ2N2My
-    ODhlYzQyNDdmY2U0YTUwNjY4NmM3MTI3ZWJlOTU4MTRjZmU0ZmZjNmUyNjll
-    NWQ0MzdiZDVmNTY5ZmIzOGIzNzRiYmRjMDQ5Njk3MzBjMWEzODU=
+    NGE1MjA5YTg3Yjg2N2E4MTk2YTE5ZTgzM2JkMWMyMGJlYmIxMTc1MzA4ODI5
+    NjM5NmRlMWZhZTI1ZWI5M2QyNjU0ZWE4MTExNjg3MTBhMThhN2IzNGUxZDgy
+    NDMzYTM3MjJkM2NiNzhhM2U2YjM3NGUwNTNkZDYyMjVlYzMxZTE=
   data.tar.gz: !binary |-
-    YjU5MmFhYTkwZWU0MWE1M2EzMTQxNjRlMjVjZjhkNTNiYjI2NmM2MWIyNjE5
-    OWFmZTZjY2JiYWMwY2I1YjMyMzk1NmRhMGJkNjBiMTM1NzJmYWFlNWQwNjJk
-    MmI3ZGY0ZDU4NzJjZDI4MmRjY2RmNjY1MzllMDY4MGFlNWY1NTk=
+    ZmQxNGQyYmZmOTJiODM5ZjVhMzBkZDJlNDczZDQzNjEyOWZiYWI4OTk4ZTYz
+    ODM3NTk2ZjJlYmY5MWFjYmM1M2EzOGI5YWU0YTljNDhhODRhM2IzNGI1M2Jh
+    YjI2YTVlMzhiMmZkZWEwN2JmYjM2NDcwY2RmY2NkODc1NmIxMzk=

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Workers
-    VERSION = '0.7.1'
+    VERSION = '0.7.2'
   end
 end

data/lib/fanforce/workers/workers.rb

@@ -14,9 +14,10 @@ class Fanforce::Workers
     @iron_cache ||= IronCache::Client.new(:token => @opts[:token] || ENV['IRON_TOKEN'], :project_id => @opts[:project_id] || ENV['IRON_PROJECT_ID'])
   end
 
-  def enqueue(queue_id, params, retries=0)
+  def enqueue(queue_id, params, options={})
+    retries = (options[:retries].present?) ? options.delete(:retries) : 0
     raise 'Params being sent to the queue must be a Hash' if !params.is_a?(Hash)
-    iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json)
+    iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json, options)
   end
 
   def add_error(queue_id, error)
@@ -35,8 +36,8 @@ class Fanforce::Workers
     }.to_json)
   end
 
-  def delete_error(queue_id, msg_id, details_id)
-    iron_mq.queue("#{queue_id}-ERRORS").delete(msg_id)
+  def delete_error(queue_id, job_id, details_id)
+    iron_mq.queue("#{queue_id}-ERRORS").delete(job_id)
     iron_cache.cache("#{queue_id}-ERRORS").delete(details_id)
   end
 
@@ -45,12 +46,12 @@ class Fanforce::Workers
     MultiJson.load(cache.value, :symbolize_keys => true)
   end
 
-  def retry_error(queue_id, msg_id, details_id)
+  def retry_error(queue_id, job_id, details_id)
     cache = iron_cache.cache("#{queue_id}-ERRORS").get(details_id)
     cache_data = MultiJson.load(cache.value, :symbolize_keys => true)
-    enqueue(queue_id, cache_data[:params], cache_data[:retries] + 1)
+    enqueue(queue_id, cache_data[:params], :retries => cache_data[:retries] + 1)
 
-    cache.delete and iron_mq.queue("#{queue_id}-ERRORS").delete(msg_id)
+    cache.delete and iron_mq.queue("#{queue_id}-ERRORS").delete(job_id)
   end
 
   def truncate(text, length=130, truncate_string="...")
@@ -63,8 +64,8 @@ class Fanforce::Workers
 
   ##########################################################################################
 
-  def self.enqueue(queue_id, payload)
-    self.new.enqueue(queue_id, payload)
+  def self.enqueue(queue_id, params, options={})
+    self.new.enqueue(queue_id, params, options)
   end
 
   def self.add_error(queue_id, error)
@@ -73,6 +74,30 @@ class Fanforce::Workers
 
   ##########################################################################################
 
+  def self.current_queue_id=(queue_id)
+    @current_queue_id = queue_id
+  end
+
+  def self.current_queue_id
+    @current_queue_id
+  end
+
+  def self.current_params=(params)
+    @current_params = params
+  end
+
+  def self.current_params
+    @current_params
+  end
+
+  def self.current_retries=(retries)
+    @current_retries = retries
+  end
+
+  def self.current_retries
+    @current_retries
+  end
+
   def self.run(worker_data, &code_block)
     require '.pluginenv'
     require 'iron_mq'
@@ -80,27 +105,36 @@ class Fanforce::Workers
     require 'fanforce/api'
     require 'active_support/all'
 
-    queue = IronMQ::Client.new.queue(worker_data['worker_id'])
-    puts 'PROCESSING...'
+    current_queue_id = worker_data['queue_id']
+    queue = IronMQ::Client.new.queue(current_queue_id)
+
     job_num = 0
+    puts 'PROCESSING...'
     while (job = queue.get(timeout: 3600)) do
       puts "JOB #{job_num+=1}: #{job.body}"
-      run_worker job, worker_data, &code_block
+      run_job job, worker_data, &code_block
     end
     puts 'DONE'
   end
 
-  def self.run_worker(msg, worker_data, &code_block)
+  def self.retry(options)
+    self.new.enqueue(current_queue_id, current_params, options.merge(retries: current_retries + 1))
+  end
+
+  def self.run_job(job, worker_data, &code_block)
     puts '----------------------------------------------------------'
     print 'PROCESSING MESSAGE: '
-    task_data = Fanforce.decode_json(msg.body)
+
+    task_data = Fanforce.decode_json(current_job_body)
+    current_params = task_data[:params]
+    current_retries = task_data[:retries]
 
     set_env_vars(worker_data['env_vars'])
-    code_block.call(task_data[:params].clone, task_data[:retries], worker_data['worker_id'])
-    msg.delete
+    code_block.call(task_data[:params].clone, task_data[:retries], worker_data['queue_id'])
+    job.delete
 
   rescue Exception => e
-    if msg.nil?
+    if job.nil?
       puts 'MESSAGE IS NIL'
       return
     end
@@ -114,10 +148,10 @@ class Fanforce::Workers
     error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
 
     puts "ADDING TO ERROR CACHE: #{error.to_json}"
-    msg.delete
+    job.delete
     puts 'DELETED MESSAGE'
 
-    self.add_error worker_data['worker_id'], error
+    self.add_error worker_data['queue_id'], error
   end
 
   def self.set_env_vars(vars)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-workers
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Caleb Clark