fanforce-workers 0.7.5 → 0.7.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJkNTljODQ3MzYzY2ZlNGJlODQzZGQ4NmU3MWI0YmNlMGM2MWIyMw==
+    ZTIwODQwZjBlODIxMTMzYmFlNzYzZWY0YzIxMTEzZWRlYjRkYWRmNg==
   data.tar.gz: !binary |-
-    ZWRlMGFiMjQ4MDBhMjVlYTUzMWIyM2UyYjE3MjliZWIzYTI4ZTk2ZA==
+    MDlhMDMyY2Q4YWMzYzgwMmQyYjFiOWFjODBmZWFlYTI2MmYxOWRiMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzY1ZjlkOTE3YzRjYWE1MzY3MDc0ODc1MGNhY2ZiMjUyYTQ0MjJmNTMxMDg3
-    Y2ZkYTQ3OGQyNGMyODA5MWJjY2NmNTIyODc0MDI0MmFkYjQ5ZDRjZjg5MzQ4
-    ZTM4OWZjNzM1NDE4MGQ1MDkwN2U4MTIxZjMzNWRjYzZlMGMyMzE=
+    MzIwZmMzMzYyOGVjMWY2NDNjOThjN2NmODk0Mzc5YjEwNjRkZDM4MDkzY2Q4
+    MDVmZmYyMDAwZGYyYmUwZTIyYTQzNjA4YTFiODcwYThhNGNkZmRjN2RhNDkz
+    NzYzOGZlN2QwZTY1MzJkOTBiNGZlMmJhMGYxMjgwMTdiNTEwYTg=
   data.tar.gz: !binary |-
-    NTY5YmNiZTI4ZTdiYTlhM2Q1YjYwNzY0MWY0MzYxNWM1MjBlYzAxNzg2MWY4
-    MjliZWU4MDg1NDVhYThhNzJkZmM1OWM2NjFiNDRkNThjZDkxMjAyZDMxYjQw
-    MmU4MGM1ZThjYTNhNGNiYmU2ZjQ4NDJmNThhOTllYTM3NzQ3NjM=
+    NGMxODhiMTRkNDllOTFkZTg5MTYxZWE5NWEwNTQ3NzZiYWY4M2M3YmZkM2E1
+    ZDkxNTdkZTQ5YTRmZDU2ZmM4YjVjNzg0ZTUxNmRlMTAwMzlhYmNhYTZlMmRi
+    YWI4NmZmZWJhZGYyYWQ4MTViNTlkMDRjNDU4Zjc1MmI1N2ViOTA=

data/lib/fanforce/workers/version.rb

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

data/lib/fanforce/workers/workers.rb

@@ -106,6 +106,14 @@ class Fanforce::Workers
     @current_retries
   end
 
+  def self.current_job=(job)
+    @current_job = job
+  end
+
+  def self.current_job
+    @current_job
+  end
+
   def self.run(worker_data, &code_block)
     require '.pluginenv'
     require 'iron_mq'
@@ -122,7 +130,9 @@ class Fanforce::Workers
     while (job = queue.get(timeout: 3600)) do
       puts "JOB #{job_num+=1}: #{job.body}"
       run_job job, &code_block
+      self.delete_job
     end
+    self.delete_job
     puts 'DONE'
   end
 
@@ -135,12 +145,13 @@ class Fanforce::Workers
     print 'PROCESSING MESSAGE: '
 
     task_data = Fanforce.decode_json(job.body)
+    self.current_job = job
     self.current_params  = task_data[:params]
     self.current_retries = task_data[:retries]
 
     set_env_vars(current_worker_env)
     code_block.call(task_data[:params].clone, retries: task_data[:retries], queue_id: current_queue_id)
-    job.delete
+    self.delete_job(job)
 
   rescue Exception => e
     if job.nil?
@@ -157,12 +168,18 @@ class Fanforce::Workers
     error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
 
     puts "ADDING TO ERROR CACHE: #{error.to_json}"
-    job.delete
+    self.delete_job(job)
     puts 'DELETED MESSAGE'
 
     self.add_error current_queue_id, error
   end
 
+  def self.delete_job(job=nil)
+    return if job.nil? and current_job.nil?
+    (job || current_job).delete
+    self.current_job = nil
+  end
+
   def self.set_env_vars(vars)
     vars.each {|k,v| ENV[k.to_s]=v }
     load 'fanforce/api/ff_globals.rb'

metadata

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