fanforce-workers 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGZlZmM5MTQ0N2M3Yjc4ZWQ4NjZkOWU0MDA3OGJjYmVjOWNlMjliNg==
+    N2YxMGU0OTJmNjZlNTU1MDBhNTk2Y2MzMTMxYTliNzZhODM2NzU4MA==
   data.tar.gz: !binary |-
-    NGNlY2NlZDVmYTNiZjAzODhhZjVjZjNhMzkzZDg5YWMyZWUzOTM1Yg==
+    Yzc0MDJlMDQ4MDIzYzc4YmVhZGQyNjY5NTkzZjE2NGZkYzZmNDMyNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2ZlMDc0NDYxNGVkZGUwNjcwMTg3MzdkNjc4MmUzZmQ2MzVkZGJjODc0ZmQ2
-    Y2ZkZjZiMzY2MmUxMThhMjgyNGYwNzc5NjJhNzI1NTU0NDdiNWFjNmU3MmVj
-    YWZkYTBhZDlhYzk0YWJiM2Y0OWNhZGFiYmM4ZTgzY2E5ZTk4ZDI=
+    YmEwY2Y5ZjAxMzMwYmQ2NTM0MjdjMGQwM2EyZGJjYWZjODViOGFjNjQxMGUy
+    ZjNlN2ZhZmIyNDEzNDU4OTM5ZDU2ODU1MTFkNzFmOTlhYjJiOWYxYmJhYmY4
+    OWVlOGRjMGU5NTk2ZTg0MDEzOTdkZDdhNzdjY2Y4MmU1OWZiNDA=
   data.tar.gz: !binary |-
-    ODkxYjE5MmFiZjNhYWJjNTg5ODZkOGY1YWY4NDUxZjM1YTE3MWUxODhjMGYy
-    YzViNzE1ZjcxNzU0ZWQ0NDNmMjJjNDhjOTA4MjhjODc0NDA3OWY3ZWI1M2I4
-    M2YxZTNkMWY5MjVkOWNjMWY3YjMzZTBiMGZmMDcyOTlkZjZkMDk=
+    ZDY2MzkzNGYxODMzNDA4Zjc0NjMzZDFjODY0NWE3YzI1ZGVmZjNkZGQwZTAz
+    OTkwMjYwYmY3OTYwZWQ3NTgzOGQ0YTUzYTFiMTg2MWQ0ZGEzN2MxNGY5MjM0
+    MDk1ZWNiODM0ZTg4OTBiMGI5YmQxNmZhYWZjYTg1ZThmZGRlMTA=

data/lib/fanforce/workers/iron.rb

@@ -5,9 +5,6 @@ class Fanforce::Workers::Iron
   end
 
   def queue(queue_id, payload)
-    raise 'Payload being sent to the queue must be a Hash' if !payload.is_a?(Hash)
-    payload = {params: payload, retries: 0}
-
     @iron_mq.queue(queue_id).post(payload.to_json)
   end
 

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module Workers
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/fanforce/workers/worker.rb

@@ -15,7 +15,6 @@ class Fanforce::Worker
     (msg.nil?) ? (return) : run_worker(msg)
   end
 
-
   def require_dependencies
     require '.pluginenv'
     require 'fanforce/api'
@@ -31,24 +30,26 @@ class Fanforce::Worker
   end
 
   def run_worker(msg)
+    print 'PROCESSING MESSAGE: '
     puts msg.body
-    puts '-------------------------------------------'
     task_data = Fanforce.decode_json(msg.body)
-    puts task_data.to_json
 
     set_env_vars(@worker_data['env_vars'])
-
     @code_block.call(task_data[:params].clone, task_data[:retries].clone)
     msg.delete
-  rescue => e
+
+  rescue Exception => e
     task_data[:last_error] = {
         exception: e.class.name,
         message: e.message,
         backtrace: e.backtrace,
         raised_at: Time.now
     }
+    task_data[:env_vars] = @worker_data['env_vars']
+    print 'ADDING TO ERROR QUEUE: '
+    puts task_data.to_json
     Fanforce::Workers.iron.queue "#{@worker_data['worker_id']}-ERRORS", task_data
-    msg.delete
+    puts 'DELETED MESSAGE'
   end
 
   def set_env_vars(vars)

data/lib/fanforce/workers/workers.rb

@@ -9,4 +9,9 @@ module Fanforce::Workers
     @iron ||= Fanforce::Workers::Iron.new(opts)
   end
 
+  def queue_task(queue_id, payload)
+    raise 'Payload being sent to the queue must be a Hash' if !payload.is_a?(Hash)
+    iron.queue queue_id, params: payload, retries: 0
+  end
+
 end

metadata

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