fanforce-worker 0.14.4 → 0.15.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNkZDg3ZTQ1N2Y2NWY0M2ZkNWQ1NDEzN2ViNjI4YjM2Y2JhMDVlNA==
+    NzVlYWZhZWUyOTlkNWZkMmIwNzkzMDAyMDJlMGU2MDkzZjhhNzBhNw==
   data.tar.gz: !binary |-
-    OWYwOWJhMmQ2ZTk5NzlmYTdiZjNmOTRhZmEzNzkwMjI4ODg4Y2I5ZA==
+    MzAwYWFkMDMzMjZjMWZmOGMzYmM2NjM5Y2Y0ZmFkN2VhMzYzNjc4Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTNlY2IzZTllYTRkZmFkMjY0NmI0YTRiNTk3NjhmNDVmODI3MjZmMmM1ODZh
-    MThjMjAxNzE3ZTU0MWE5ODI4OTY5ZjQ2ZjY0OWI3YmQ5YWRjYzA4YTlmYjVl
-    Njg5NTI5ODdmMzFjOGI1MWQ3MjFmMDY3NjNhZTY1NGQ2MmUzYjg=
+    YjgwNjRjMDYxYTJlYzNiYmY0ZDBhMzY0MmQ3ODM3MWY0NjlmMTFjM2E0N2Vh
+    ZjFhZTZhZmVmYTFjNTQ0N2VkMjZhYTcyOWMxMDRjYTYzYzRmNTg3ZWY4YjA0
+    ZGJlMmY4NGRmOTBkOTBjYTQzMGMyNWEzMDRiMjU1MGViMjM3ODQ=
   data.tar.gz: !binary |-
-    MDRhNTBhN2EzYmYzZDkxYzcwZWNlMmQ2YzFkNTZmNGRhYzc0MmNlZTQ0Yzk1
-    NjhmNzM4ZmViMThkYmQ5Y2MxMzUwZGFjZDlkMDI2MTNiZDgyNThlODM3OTBj
-    NzVlNGMxY2FlOWVhZjgzYmIxNzQ2M2NmY2IyOWM2NGIxMTkxMWU=
+    OWI1NWVmNzBmYjgxZGYxMDRlMDZjZWRiODM0ZDFiMzhkNjJhYTg2YjA0NzA2
+    NGI4MDA2NDY0MWMzMDFmOWRmYTRjMjZlOTk5OGNlZWZkNTdmMDI1OTM5Mzg4
+    ZjA0YmVhOGE5YjUyNmNlNDA0NTAyYTM0NzhjMTczZDBhODlkNDE=

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.14.4'
+    VERSION = '0.15.0'
   end
 end

data/lib/fanforce/worker/worker.rb

@@ -147,7 +147,7 @@ class Fanforce::Worker
   def self.run(worker_data, min_execution_time=300, &code_block)
     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
 
-    puts 'LOADING ENV...'
+    puts 'LOADING WORKER ENV...'
     load_env
     require 'iron_mq'
     require 'iron_cache'
@@ -158,7 +158,8 @@ class Fanforce::Worker
     self.current_worker_env = worker_data['env_vars']
     queue = IronMQ::Client.new.queue(current_queue_id)
 
-    puts 'PROCESSING...'
+    puts 'PROCESSING JOBS...'
+    puts '------------------------------------------------------------------------------------'
     job_num = 0
     job_data = nil
     while job_has_enough_time_to_run(min_execution_time) and (job = queue.get(timeout: 3600)) do
@@ -169,9 +170,10 @@ class Fanforce::Worker
         run_job(job, job_data, &code_block)
       end
       self.delete_job
+      puts '------------------------------------------------------------------------------------'
     end
     self.delete_job
-    puts "  FINISHED JOB #{job_num+=1}"
+    puts 'WINDING DOWN WORKER!'
   rescue Timeout::Error => e
     handle_job_error(e, job, job_data)
   rescue Exception => e
@@ -195,9 +197,6 @@ class Fanforce::Worker
   end
 
   def self.run_job(job, job_data, &code_block)
-    puts '----------------------------------------------------------'
-    puts 'PROCESSING JOB... '
-
     self.current_job = job
     self.current_params  = job_data[:params]
     self.current_retries = job_data[:retries]
@@ -214,9 +213,7 @@ class Fanforce::Worker
     raise($!, "#{$!}: THERE IS NO JOB", $!.backtrace) if job.nil?
 
     self.delete_job(job)
-    puts 'REMOVED JOB FROM QUEUE'
-
-    puts 'CANNOT SAVE TO ERROR CACHE:'
+    puts 'REMOVED JOB FROM QUEUE, BUT COULD NOT SAVE TO ERROR CACHE...'
     raise($!, "#{$!}: #{job_data.to_json}", $!.backtrace)
   end
 
@@ -234,9 +231,8 @@ class Fanforce::Worker
     error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
 
     self.delete_job(job)
-    puts 'REMOVED JOB FROM QUEUE'
-
-    puts "SAVING TO ERROR CACHE: #{error.to_json}"
+    puts 'REMOVED JOB FROM QUEUE, AND SAVING TO ERROR CACHE...'
+    puts error.to_json
     self.add_error current_queue_id, error
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-worker
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Caleb Clark