fanforce-worker 0.15.2 → 0.15.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZThiNDMyNGQ4YzllYWQxMTRiZWUyZjkxZjU4ODMxNmIwOTY4OTk4Mg==
+    ODcwMzNkNjFkNDc5OTFlMDRkZDk0ZWI1YzhjYzU0MGU1YTg4NjdiZg==
   data.tar.gz: !binary |-
-    NWNiM2QwNTA4NWUxYjUzNTNhNjc0NzgwYzQxNWE2MWUyNzI3ZmIzZQ==
+    ZDYxODhlOTE4OGVjOGE2Mjk3NDVkZGQ2NDYwMmIwMzZjNTY1MTA2Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmNhMTE0OWVmZGRmYmFhYTc0NTcyZTc3ODQ3NDdjNDBhMTRlNmQ5OGVhZjUz
-    OWJmYzE5ZGUxOTYwZTg3NGM2YTRjNzdhMGYzODk3NGQyZGY1ODljNDJkNDIz
-    NDlkMWQxMTYxOTg0NzA3MTNkMmQ4YzdhODZlM2YwYjcxYzBiMDU=
+    NTI3OWU5N2FlMDZmNDhiODllZDUyZTJkN2VmNjJmM2VjMjNjNzU2ZTI0OGUx
+    MDNjMzkzMzJjYzA2NDQwMzYxNWM4YTBjMjc0YmIzMTAxNTUxYzhkMzQ1ZmM4
+    MDRmYTZlZDQwOTUzMzg0MTk1MTJjZTI1NTJjNWMzNDVjNTI3ZmI=
   data.tar.gz: !binary |-
-    ZWY5NGMxNzZlNzg0YzY2ZWM1ZjZkMmEyMWJjMzc2ODY5YjRhNGI4NmYxZjA4
-    NzQ3YWU3ZTg2NzI3YWZlMWUyNjZhZDMzZjhjNjYwOWE3NzIyZGNkZTZkYzdj
-    YjFjYTc2MDkyNGZmNzE0MzE5M2E5NTA0NTAxYzI2NjYxNzI2Mjc=
+    ZjY4YzdhODVmMTVhYzVlNjdkYTdlMjg0YjkwMGE3YzM2OWMwYTMxYWZiZWJk
+    ODQ0ZTZjYTNmMDI4Y2FlNWVmOTg2YjBiZTkyMjMxOWFiNTA0NDY0ZGE4ZmJk
+    MzM5ZmNjOGZiODI5ZTBlN2Y4NmQ5NmI3YTViZmExMWQxZWU2OGE=

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.15.2'
+    VERSION = '0.15.3'
   end
 end

data/lib/fanforce/worker/worker.rb

@@ -2,6 +2,8 @@ require 'timeout'
 
 class Fanforce::Worker
 
+  class Timeout < RuntimeError; end
+
   LOADED_AT = Time.now
   MAX_EXECUTION_TIME = 3300
 
@@ -166,7 +168,7 @@ class Fanforce::Worker
     job_data = nil
     while job_has_enough_time_to_run(min_execution_time) and (job = queue.get(timeout: 3600)) do
       puts "- JOB #{job_num+=1}: #{job.body}"
-      timeout(worker_time_remaining) do
+      Timeout::timeout(worker_time_remaining, Fanforce::Worker::Timeout) do
         job_data = nil
         job_data = Fanforce.decode_json(job.body)
         run_job(job, job_data, &code_block)
@@ -176,8 +178,6 @@ class Fanforce::Worker
     end
     self.delete_job
     puts 'WINDING DOWN WORKER!'
-  rescue Timeout::Error => e
-    handle_job_error(e, job, job_data)
   rescue Exception => e
     handle_job_loading_error(e, job, job_data)
   end

metadata

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