fanforce-worker 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00dc815d382322dd3328c71740a910c613fa04d
-  data.tar.gz: 6744c0ffc2932013c2659fed1d125a5dfaffccff
+  metadata.gz: 7c71c11441ca20666707cfda018361ddcae5108e
+  data.tar.gz: 9e9fd0de91fb612f9eb9dabf9227ebe0d9c033d8
 SHA512:
-  metadata.gz: 4f1013f8b2ee5ee484d36a43017015f8893c6c5a1cb5110f61682a1c87ce0cc273cab548ec7fa698960b17dae6c0f9e649f7ef351718bde01d18c6e802f219df
-  data.tar.gz: 6438e99930cc98fadeff9c25e924bc2cb599bfab13fac710daaa0e5cac5129dbe50352576ef556223bba21516fe51faa615374b052a46811164c17ad54f36494
+  metadata.gz: e6bb2bd78b13048972dc62afe18e7dfdc873080069a464f158bdfdb959cb807724510d6bd481007448812bfc497a6bbc90139f704963467394f64fe2dd3582e6
+  data.tar.gz: 7951521e3f433a99bebbc38d2bec824fa1f9324ae8de869cae8ea73f5c390ba1ea5807c6bd3ef5ee768547af547dbf2c68ac9632a60887df9bda14a8fcfc5d10

data/lib/fanforce/worker/errors.rb

@@ -142,6 +142,7 @@ class Fanforce::Worker::Error
   def self.retry(queue_id, raw_error)
     error = format(raw_error.symbolize_keys)
     payload = MultiJson.load(error[:raw_json], symbolize_keys: true) rescue {}
+    queue_id = queue_id.gsub(":#{ENV['DEVELOPER_EMAIL']}", '') if ENV['DEVELOPER_EMAIL']
     Fanforce::Worker.set_config(iron_token: error[:iron_token], iron_project_id: error[:iron_project_id])
     Fanforce::Worker.enqueue(queue_id, payload, :retries => error[:retries] + 1)
     delete(queue_id, error[:error_id])

data/lib/fanforce/worker/runner.rb

@@ -12,7 +12,7 @@ class Fanforce::Worker::Runner
     raise "min_execution_time was set to #{min_execution_time}, which is #{min_execution_time - MAX_EXECUTION_TIME} seconds too long" if min_execution_time > MAX_EXECUTION_TIME
     log.debug 'LOADING WORKER ENV'
 
-    @queue_id   = worker_data['queue_id'] || (raise 'worker_data must contain queue_id')
+    @queue_id = worker_data['queue_id'] || (raise 'worker_data must contain queue_id')
     @worker_env = worker_data['env_vars'] || {}
 
     @min_execution_time = min_execution_time
@@ -27,7 +27,7 @@ class Fanforce::Worker::Runner
     log.debug '------------------------------------------------------------------------------------'
     job_num = 0
     job_data = nil
-    while job_has_enough_time_to_run and (job = Fanforce::Worker.iron_mq.queue(@queue_id).get(timeout: 3600)) do
+    while job_has_enough_time_to_run and (job = Fanforce::Worker.iron_mq.queue(iron_queue_id(@queue_id)).get(timeout: 3600)) do
       log.debug "- JOB #{job_num+=1}: #{job.body}"
       timeout(worker_time_remaining, Timeout) do
         job_data = nil

data/lib/fanforce/worker/utils.rb

@@ -7,4 +7,8 @@ module Fanforce::Worker::Utils
     Fanforce::Worker.log
   end
 
+  def iron_queue_id(iron_queue_id)
+    (ENV['RACK_ENV'] == 'development' && ENV['DEVELOPER_EMAIL']) ? "#{iron_queue_id}:#{ENV['DEVELOPER_EMAIL']}" : iron_queue_id
+  end
+
 end

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.31.0'
+    VERSION = '0.32.0'
   end
 end

data/lib/fanforce/worker/worker.rb

@@ -38,6 +38,7 @@ class Fanforce::Worker
   def self.enqueue(queue_id, params, options={})
     raise 'Params being sent to the queue must be a Hash' if !params.is_a?(Hash)
 
+    queue_id = Utils.iron_queue_id(queue_id)
     retries = (options[:retries].present?) ? options.delete(:retries) : 0
     iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json, options)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-worker
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq