fanforce-worker 0.14.2 → 0.14.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA0NGUyMzZiYTU0YzFiMWQ0NTM2NGI3MzI2OTUzOGU1MDg4MDg3OA==
+    YjgyZmQ5Y2MzY2M5ODk1ZDQ3YzQ3ODJhMzAzZjhmOGYzNjExZDIyOA==
   data.tar.gz: !binary |-
-    OWE0M2FkMDNjZThiNTE3ZmJmNTc2YzQxNGNiNTBjNDhmMTAxYTc2MA==
+    NjFkZmQ5ZjFhNzI2YmE5NzUzZGJlYzM3YjE5YTk4Y2FmMzMzNmRlMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzU5OTA0ZmY4ZmIzZGIwYjhmMjM0OGE1ZWQ2NmQ3ZjVkMDExMzNkNTNhNmI2
-    OTM1YjM1NmFmMGVjMjRjNWZmYTViZDgzZDhkYWM1MjM5NWY0NzE0MjQzYjZh
-    NzRlNGMyZjY0ZTE0NDE2NzViZWIxZTg0YWQzNDg0ZjVjZDI3MzY=
+    M2M3OTliYjg1NThhOWFlMmNlMjVhNzk4MzA0ODA0MWNhZjQwOGI2Nzk5YWFl
+    MzdlYjZiYmNjNmZjNTQ4ZmM4YzlmMTc1ZTRiZjliNmYzNjAxZTcwYWY2MmE0
+    MDcxMDVkMTAwZDU4NmYxZDQ3Zjc3ZTU4NDZiNWQ3MWQ1YTBjNTI=
   data.tar.gz: !binary |-
-    NjdjMWI2ODdlNjdiNzJiOGI0MTk2ZDJhNzczZGE0YWE4ZTg2ZjdmMjA2ZjA4
-    M2NjMzBjMDY2MzkzZDAxNjAxYzQxYjFiMDFmM2Y5OWQxZGZiMTE5NzkwYmQw
-    NGU0NDZmODcyZTg0MmUxMWY0NWM2NDBjZWI4ZDA1YzQ2M2I5Yjc=
+    OTgxMDM2NWQ2NjcwZTE5ZTdlMjc3NTgzNTY2MzZjYjQyOTYzNjM5ODk2N2E1
+    ODM2OWVjNTYzZTY5M2YzMTdjZWVkMmU5YzgxNDQ1ZThmNTY3MWNjMjU1Y2Jj
+    ZTA1NzQ3NjUxOTEzMTM0NDI1YTc1ZWU5N2JmYmRlNDBlNWIwZTc=

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.14.2'
+    VERSION = '0.14.3'
   end
 end

data/lib/fanforce/worker/worker.rb

@@ -1,6 +1,6 @@
 class Fanforce::Worker
 
-  LOAD_TIME = Time.now
+  LOADED_AT = Time.now
   MAX_EXECUTION_TIME = 3300
 
   def initialize(opts={})
@@ -161,9 +161,9 @@ class Fanforce::Worker
     puts 'PROCESSING...'
     job_num = 0
     job_data = nil
-    while has_enough_time_to_run(min_execution_time) and (job = queue.get(timeout: 3600)) do
+    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(time_remaining) do
+      timeout(worker_time_remaining) do
         job_data = nil
         job_data = Fanforce.decode_json(job.body)
         run_job(job, job_data, &code_block)
@@ -178,15 +178,15 @@ class Fanforce::Worker
     handle_job_loading_error(e, job, job_data)
   end
 
-  def time_remaining
-    time_running = Time.now - LOAD_TIME
-    MAX_EXECUTION_TIME - time_running
+  def self.worker_time_remaining
+    time_since_load = Time.now - LOADED_AT
+    MAX_EXECUTION_TIME - time_since_load
   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
+  def self.job_has_enough_time_to_run(min_execution_time)
+    time_since_load = Time.now - LOADED_AT
+    return false if time_since_load < MAX_EXECUTION_TIME
+    return false if worker_time_remaining < min_execution_time
     return true
   end
 

metadata

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