fanforce-workers 0.1.0 → 0.2.0.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDMxM2ZhNzU4NjJkNjE5OTNhOGE5OTU0MDlkYjUzYmYxNDJmNWZhZg==
+    NWJlMDE5ZmJjMDEyMGEzZjcwMWQ0OWEyMmVhMTQzYWI0NTVlNWFiNA==
   data.tar.gz: !binary |-
-    OGFmNzJkMzEwNzA4ZjBjNDY2NWVhNDA3OTE0NDE1NjI0ZTM4ZjlmNw==
+    NzgxMDY0YzU0ODIxOTYzYjNiYTgwMjFlNzNmYzBlNTliOTAzZDViNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDYwZjg3MjMyNThjMmU0YTgyNmMxMTI2NmQ4OWZiZTdmZWNmZmZlY2E2NWEy
-    MjE1OWU4YWEyOTc5YmFkZjQwOGE5NDdlMzgyNGRkYTAzZGQ2YTliMGZhYWY0
-    MzZmNjk3NmYzNzQwOGEwYTNjNGUzYTM1NjEyMmYyOWRiZWIxOTc=
+    YWQ2MDY2OWIxMjUxODMwNjQ1ZGEzODc5N2Q3ZWRhODE1YThlYzk2ZTI4MTc3
+    ZjAxZGU0NjMyN2JlNzI1Y2I1NzNlMDViYjIxMzI0YjA1YzFhZDY4NzQwMTZh
+    MTZlYjhhMGMzOWE1ZWY2M2MzNTQ1YWJmYjQzN2RiOTU5YmYxY2E=
   data.tar.gz: !binary |-
-    ZDU2MGNlMmFiNjQ5NjlkY2RiZTVhNTBjNGE1MTA4NDY4ZDYyZjNkYTUzOWIz
-    MjJhZTlmNDVmMmVhN2JiY2RkZTNmODk1NDAxMTNjMjY4MjY1MjE5OTZmNjI3
-    MmRkM2FmYmY3NTU1OTEyYmU5MDhjNTM2NTUxYTcyYTE2MTkzNTI=
+    NzRiZjlkZjhhZDVlNWNjMGYwNTZmMzU3NzUzNTk1NGM3ZWMwNDBhNDdlOTdj
+    YmYyNDU5NDk2OWM5YzBhODM2ODViZmJjZDAzZWVjYjVlMjMyZjNmMTIxMmM2
+    MWYxMTA2YmNhZmJkYWE1NTczOTBlMDllNjExODgwMzEyYTU3YTU=

data/lib/fanforce/workers/iron.rb

@@ -5,8 +5,10 @@ class Fanforce::Workers::Iron
   end
 
   def queue(queue_id, payload)
-    payload = (payload.is_a?(Hash) or payload.is_a?(Array)) ? payload.to_json : payload.to_s
-    @iron_mq.queue(queue_id).post(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
 
 end

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   module Workers
-    VERSION = '0.1.0'
+    VERSION = '0.2.0.pre'
   end
 end

data/lib/fanforce/workers/worker.rb

@@ -1,19 +1,18 @@
 class Fanforce::Worker
 
-  def self.run(init_params, &worker_code)
-    self.new(init_params, &worker_code)
+  def self.run(worker_data, &code_block)
+    self.new(worker_data, &code_block)
   end
 
-  def initialize(init_params, &worker_code)
+  def initialize(worker_data, &code_block)
     require_dependencies
     run_validations
 
-    @init_params = init_params
-    @worker_code = worker_code
+    @worker_data = worker_data
+    @code_block = code_block
 
-    msg = iron_mq.queue(init_params['worker_id']).get #(timeout: 3600)
-
-    (msg.nil?) ? (return) : run_worker(msg, 0)
+    msg = iron_mq.queue(worker_data['worker_id']).get(timeout: 3600)
+    (msg.nil?) ? (return) : run_worker(msg)
   end
 
 
@@ -31,17 +30,27 @@ class Fanforce::Worker
     @iron_mq ||= IronMQ::Client.new
   end
 
-  def run_worker(msg, retries)
-    params = Fanforce.decode_json(msg.body)
-    @worker_code.call(params, retries)
+  def run_worker(msg)
+    task_data = Fanforce.decode_json(msg.body)
+    puts task_data
+
+    set_env_vars(@worker_data['env_vars'])
+
+    @code_block.call(task_data[:params].clone, task_data[:retries].clone)
     msg.delete
   rescue => e
-    params = params.is_a?(Hash) ? {original_params: params} : {original_body: msg.body}
-    params[:retries] = retries + 1
-    params[:error_message] = e.message
-    params[:error_backtrace] = e.backtrace
-    Fanforce::Workers.iron.queue "#{@init_params['worker_id']}-ERRORS", params
+    task_data[:last_error] = {
+        exception: e.class.name,
+        message: e.message,
+        backtrace: e.backtrace,
+        raised_at: Time.now
+    }
+    Fanforce::Workers.iron.queue "#{@worker_data['worker_id']}-ERRORS", task_data
     msg.delete
   end
 
+  def set_env_vars(vars)
+    vars.each {|k,v| ENV[k.to_s]=v }
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-workers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Caleb Clark
@@ -83,9 +83,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3