fanforce-worker 0.13.2 → 0.14.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODU5NWUzMTI4ZmE2MTliYTkwMTkyNWY2NWVhZjI0YWQ0M2IwYzQyYw==
+    YjFmOGE4MWZhYmE2MGVjZjYyZWIwYzA0M2Y0Njg4MzdkZTc3NGNiMQ==
   data.tar.gz: !binary |-
-    ZGEwODdhMGMwMmE1NDI4MWZiYjQzNjE2YWI1Zjg0YmJkYmE4M2E3Ng==
+    MmNlNjY1NDRjODY2OThlYWIzMjEwNGZlN2JjODI0NDI4Yzg5NTA1Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjBmMDgyYTIwMTFkZjliNGU3Y2E5ZTAxYzBhMzU1MTI5ZGE2MDQzZTUwNjkx
-    NjI2OWY1ODYyNzlkNDAzMDU5ZWI0Mzk4ZmI2Yzg5ZDA1MDk0OWI4ZWExMDY2
-    M2ExNjBiZWE1ODU5ODMwNzk4OGQ5N2U1ODkwYWQ1MmM2YmQ0YWI=
+    M2Y0ODUwNDZjNjBlNTFmNjk1MGY5YjBmMTJhYTNiMDk0ZTI1ZmFlMDA5OTQz
+    OGMwNDg4ZDIxZWYxOWNkYThjMjJlMzNlNTYyMWYzODJkMmFlMDMxMjgyODBl
+    N2ZmNTBiZDUxZjI3NTY4YmVhMTk4YzUzMDM5MGZlMDRmYzExY2U=
   data.tar.gz: !binary |-
-    Y2QxYjNhOWMwYzI5Njk0Yjc3YTgwOTIxM2Y0MWQwYzllYzI4Y2RkNzVhMWIw
-    NzcyMGZiM2YxZDk4NGQwNWRhZWRjNzM0ZGU4Yjc3NWI4MjdkZDQwNmQ2NzI4
-    MzhmODVlMGFmMDA5ODkyZjc4MDdiYTIxMDNkMDI4MmU4N2I1Y2I=
+    MGE3ODE0ZmRhNDZlMzQ1NWY0YTg5OWI5MDRiM2MwODNkMzIyNGY3NTE1ZWFl
+    MjlkOGU5MWNhODVmNzY5YThjYjQ1NWU1MDMyZjE2ODFlNGUyNTMyMjIxZGIw
+    MmJlYjdlMjFhYzk3ZWI0ODBlY2I0NWY2MTM4YTAyZjkyNjhmNDQ=

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.13.2'
+    VERSION = '0.14.0'
   end
 end

data/lib/fanforce/worker/worker.rb

@@ -1,6 +1,7 @@
 class Fanforce::Worker
 
   LOAD_TIME = Time.now
+  MAX_EXECUTION_TIME = 3300
 
   def initialize(opts={})
     @opts = opts
@@ -143,7 +144,7 @@ class Fanforce::Worker
     end
   end
 
-  def self.run(worker_data, &code_block)
+  def self.run(worker_data, min_execution_time=300, &code_block)
     puts 'LOADING ENV...'
     load_env
     require 'iron_mq'
@@ -155,53 +156,85 @@ class Fanforce::Worker
     self.current_worker_env = worker_data['env_vars']
     queue = IronMQ::Client.new.queue(current_queue_id)
 
-    job_num = 0
     puts 'PROCESSING...'
-    while (Time.now - LOAD_TIME) < 1800 and (job = queue.get(timeout: 3600)) do
+    job_num = 0
+    job_data = nil
+    while has_enough_time_to_run(min_execution_time) and (job = queue.get(timeout: 3600)) do
       puts "- JOB #{job_num+=1}: #{job.body}"
-      run_job job, &code_block
+      timeout(time_remaining) do
+        job_data = nil
+        job_data = Fanforce.decode_json(job.body)
+        run_job(job, job_data, &code_block)
+      end
       self.delete_job
     end
     self.delete_job
     puts "  FINISHED JOB #{job_num+=1}"
+  rescue Timeout::Error => e
+    handle_job_error(job, e, job_data)
+  rescue Exception => e
+    handle_job_loading_error(job, e, job_data)
+  end
+
+  def time_remaining
+    time_running = Time.now - LOAD_TIME
+    MAX_EXECUTION_TIME - time_running
+  end
+
+  def has_enough_time_to_run(min_execution_time)
+    time_running = Time.now - LOAD_TIME
+    return false if time_running < MAX_EXECUTION_TIME
+    return false if time_remaining < min_execution_time
+    return true
   end
 
   def self.retry(options)
     self.new.enqueue(current_queue_id, current_params, options.merge(retries: current_retries + 1))
   end
 
-  def self.run_job(job, &code_block)
+  def self.run_job(job, job_data, &code_block)
     puts '----------------------------------------------------------'
-    print 'PROCESSING MESSAGE: '
+    puts 'PROCESSING JOB... '
 
-    task_data = Fanforce.decode_json(job.body)
     self.current_job = job
-    self.current_params  = task_data[:params]
-    self.current_retries = task_data[:retries]
+    self.current_params  = job_data[:params]
+    self.current_retries = job_data[:retries]
 
     set_env_vars(current_worker_env)
-    code_block.call(task_data[:params].clone, retries: task_data[:retries], queue_id: current_queue_id)
+    code_block.call(job_data[:params].clone, retries: job_data[:retries], queue_id: current_queue_id)
     self.delete_job(job)
 
   rescue Exception => e
-    if job.nil?
-      puts 'MESSAGE IS NIL'
-      return
-    end
-    error = task_data.merge(
-      http_code: (e.code if e.respond_to?(:code)),
-      exception: e.class.name,
-      message: e.message,
-      backtrace: e.backtrace,
-      errored_at: Time.now,
-      env_vars: current_worker_env
+    handle_job_error(job, e, job_data)
+  end
+
+  def self.handle_job_loading_error(e, job, job_data)
+    raise($!, "#{$!}: THERE IS NO JOB", $!.backtrace) if job.nil?
+
+    self.delete_job(job)
+    puts 'REMOVED JOB FROM QUEUE'
+
+    puts 'CANNOT SAVE TO ERROR CACHE:'
+    raise($!, "#{$!}: #{job_data.to_json}", $!.backtrace)
+  end
+
+  def self.handle_job_error(e, job, job_data)
+    raise($!, "#{$!}: THERE IS NO JOB", $!.backtrace) if job.nil?
+
+    error = job_data.merge(
+        http_code: (e.code if e.respond_to?(:code)),
+        exception: e.class.name,
+        message: e.message,
+        backtrace: e.backtrace,
+        errored_at: Time.now,
+        env_vars: current_worker_env
     )
     error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
 
-    puts "ADDING TO ERROR CACHE: #{error.to_json}"
     self.delete_job(job)
-    puts 'DELETED MESSAGE'
+    puts 'REMOVED JOB FROM QUEUE'
 
+    puts "SAVING TO ERROR CACHE: #{error.to_json}"
     self.add_error current_queue_id, error
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-worker
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq