fanforce-workers 0.7.4 → 0.7.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGFjN2Q1NTkwMjZmMDRiYjFlMmMyYmY1YmI5MzQwMjM2ODg4MGVmZg==
+    ZTJkNTljODQ3MzYzY2ZlNGJlODQzZGQ4NmU3MWI0YmNlMGM2MWIyMw==
   data.tar.gz: !binary |-
-    ZDNiMmI3MjIwNDY0NzJmZWQxODNhYTdkOGNmYTRiNTMwOTkzMTE3ZA==
+    ZWRlMGFiMjQ4MDBhMjVlYTUzMWIyM2UyYjE3MjliZWIzYTI4ZTk2ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTgzZjhjYTdlYzU5YzQwZTBjMmEwYjljODA0MDQ1YjQwYTM3MGNiNWE5MDc0
-    ZjExNDUxMmRkNDU4MzM1ZjhlM2EwMmQyZDcwY2IyZDcwZTkxMjJmY2E5ZTAx
-    MDc2YmQ4MzYzYzRjN2JiZWM2OGMxOTRiMGMyN2IxYTE2MWNhYjg=
+    MzY1ZjlkOTE3YzRjYWE1MzY3MDc0ODc1MGNhY2ZiMjUyYTQ0MjJmNTMxMDg3
+    Y2ZkYTQ3OGQyNGMyODA5MWJjY2NmNTIyODc0MDI0MmFkYjQ5ZDRjZjg5MzQ4
+    ZTM4OWZjNzM1NDE4MGQ1MDkwN2U4MTIxZjMzNWRjYzZlMGMyMzE=
   data.tar.gz: !binary |-
-    NmY2ZGI1MmExNzc0ZWE1NjM1OWEzNTM1YzgwZGEwYzk1ZTg5MDI5MGZkOWY0
-    MjMzMWEyNzRhYTU0NjVmNDdhM2NjMTUxNGVlODI5YzU0MWZhODdkYjEzYzUx
-    MjVhYzk2OGQ3N2I0MDRhNGJjYmQwZjIzMGIxZGI4Yjg2YTY3N2U=
+    NTY5YmNiZTI4ZTdiYTlhM2Q1YjYwNzY0MWY0MzYxNWM1MjBlYzAxNzg2MWY4
+    MjliZWU4MDg1NDVhYThhNzJkZmM1OWM2NjFiNDRkNThjZDkxMjAyZDMxYjQw
+    MmU4MGM1ZThjYTNhNGNiYmU2ZjQ4NDJmNThhOTllYTM3NzQ3NjM=

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Workers
-    VERSION = '0.7.4'
+    VERSION = '0.7.5'
   end
 end

data/lib/fanforce/workers/workers.rb

@@ -82,6 +82,14 @@ class Fanforce::Workers
     @current_queue_id
   end
 
+  def self.current_worker_env=(env_vars)
+    @current_worker_env = env_vars
+  end
+
+  def self.current_worker_env
+    @current_worker_env
+  end
+
   def self.current_params=(params)
     @current_params = params
   end
@@ -105,14 +113,15 @@ class Fanforce::Workers
     require 'fanforce/api'
     require 'active_support/all'
 
-    current_queue_id = worker_data['queue_id']
+    self.current_queue_id   = worker_data['queue_id']
+    self.current_worker_env = worker_data['env_vars']
     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_job job, worker_data, &code_block
+      run_job job, &code_block
     end
     puts 'DONE'
   end
@@ -121,16 +130,16 @@ class Fanforce::Workers
     self.new.enqueue(current_queue_id, current_params, options.merge(retries: current_retries + 1))
   end
 
-  def self.run_job(job, worker_data, &code_block)
+  def self.run_job(job, &code_block)
     puts '----------------------------------------------------------'
     print 'PROCESSING MESSAGE: '
 
     task_data = Fanforce.decode_json(job.body)
-    current_params = task_data[:params]
-    current_retries = task_data[:retries]
+    self.current_params  = task_data[:params]
+    self.current_retries = task_data[:retries]
 
-    set_env_vars(worker_data['env_vars'])
-    code_block.call(task_data[:params].clone, task_data[:retries], worker_data['queue_id'])
+    set_env_vars(current_worker_env)
+    code_block.call(task_data[:params].clone, retries: task_data[:retries], queue_id: current_queue_id)
     job.delete
 
   rescue Exception => e
@@ -143,7 +152,7 @@ class Fanforce::Workers
       message: e.message,
       backtrace: e.backtrace,
       errored_at: Time.now,
-      env_vars: worker_data['env_vars']
+      env_vars: current_worker_env
     )
     error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
 
@@ -151,7 +160,7 @@ class Fanforce::Workers
     job.delete
     puts 'DELETED MESSAGE'
 
-    self.add_error worker_data['queue_id'], error
+    self.add_error current_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.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Caleb Clark