fanforce-workers 0.5.5 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjhhOThmOTJmNDIyYjJkYjk4NDUzODM5Nzc2MTM2M2MzNDU5ZDFhNg==
+    YWFiMzEzODAwOTE3MmJiYjI1YjFlNzA2NzI2Mzc3Y2JmNDJhMDI2OQ==
   data.tar.gz: !binary |-
-    MmY0YzA0NmQ1MDE5Nzg0OGUzM2VkMjg2Mzg3YmRiMDE3M2IzM2I2YQ==
+    YzU4MGJhOWE1ZWYwOGIyZGJjN2Y1NmM5YzBjYTQzYjFhYjAxYTYxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGFkMDdlZmUwZDExNWFjOGQ2ZmViM2Y1YTVhOTA4Njk4NmY0YzIzZmUwOWNi
-    ZDI3MzI5Y2FhYTlhOTlhNmQ1MGE3Zjg2ZTY2OTBkMjk0MzVkYjQ0N2QwMmI1
-    ODIxYmJlZGI2MWQzNTc5ZTc4ZTMxZTM2YmJiZWI4OTUyM2VjZTQ=
+    NDA2NDkwZTYwOGZjZTQxNzBlZDI3ZjE5MGIwMDgzNDZiMDU4YjRjYjBiNzM2
+    YjFmMTQ5OTZjYmZhYzU5OTczNWQ1NTYxMDY1ODFiNTY3YTYxMTMxYjQ0YjM1
+    MzYzODQzY2Y5ZGIwMjAzYzJhZWJlZTNhNTMxM2JiNGI2NDRlYzQ=
   data.tar.gz: !binary |-
-    NjE3NWFhYWIzYTFiOTFjOTYzYWE0Y2I2ZDMwODAwMjgzOGVlY2NiYTBiNDMz
-    MDlhNDliNDIxNmQ2NTlkMTkxY2JlYTg1OTA2NWM1YjRmNDA4YTIwMjk2NzMy
-    ZGQ0YTBkYjIwNTA1NTU0MTE4N2MwY2QxNDdjNzY4MGEwYzljODQ=
+    MTZiOTIwOGZjOTAxNDg5MzEwYTg4ODVlY2JhMTZhMDA0YWNiMWNmNDBlNDNk
+    ZDY3NjQ5OTg0ZGIzNzI2MWQ0OGY2N2YxMThkMDFkYmRhMGVmMDcwYmI3NzBi
+    YTcyMGRiNGVkYTAxMGFhYjZkMDI1MDIzNWFiYTYyMTgyYjliZTQ=

data/fanforce-workers.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'iron_mq', '~> 4'
-  gem.add_runtime_dependency 'typhoeus'
+  gem.add_runtime_dependency 'iron_cache', '~> 1.4'
+  gem.add_runtime_dependency 'uuidtools', '~> 2.1'
+  gem.add_runtime_dependency 'typhoeus', '~> 0.6'
   gem.add_runtime_dependency 'activesupport', '~> 3.2'
   gem.add_runtime_dependency 'fanforce-api', '~> 0.9'
 end

data/lib/fanforce/workers/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Workers
-    VERSION = '0.5.5'
+    VERSION = '0.6.0'
   end
 end

data/lib/fanforce/workers/workers.rb

@@ -4,38 +4,79 @@ class Fanforce::Workers
     @opts = opts
   end
 
-  def iron
-    require_relative 'iron'
-    @iron ||= Fanforce::Workers::Iron.new(@opts)
+  def iron_mq
+    require 'iron_mq'
+    @iron_mq ||= IronMQ::Client.new(:token => @opts[:token] || ENV['IRON_TOKEN'], :project_id => @opts[:project_id] || ENV['IRON_PROJECT_ID'])
   end
 
-  def enqueue(queue_id, payload)
-    raise 'Payload being sent to the queue must be a Hash' if !payload.is_a?(Hash)
-    iron.enqueue queue_id, params: payload, retries: 0
+  def iron_cache
+    require 'iron_cache'
+    @iron_cache ||= IronCache::Client.new(:token => @opts[:token] || ENV['IRON_TOKEN'], :project_id => @opts[:project_id] || ENV['IRON_PROJECT_ID'])
   end
 
-  def retry_error(queue_id, msg_id)
-    msg = iron.client.queue(queue_id + '-ERRORS').peek(msg_id)
-    data = MultiJson.load(msg.body, :symbolize_keys => true)
-    iron.enqueue queue_id, params: data[:params], retries: data[:retries] + 1
-    msg.delete
+  def enqueue(queue_id, params, retries=0)
+    raise 'Params being sent to the queue must be a Hash' if !params.is_a?(Hash)
+    iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json)
   end
 
-  ##########################################################################################
+  def add_error(queue_id, error)
+    require 'uuidtools'
+    details_id = UUIDTools::UUID.random_create
+    iron_cache.queue("#{queue_id}-ERRORS").put(details_id, error.to_json)
+    iron_mq.queue("#{queue_id}-ERRORS").post({
+        details_id: details_id,
+        exception: truncate(error[:exception]),
+        message: truncate(error[:message].to_s),
+        params: truncate(error[:message].to_json),
+        errored_at: error[:errored_at],
+        retries: error[:retries],
+        env_vars: truncate(error[:env_vars].to_json),
+        curl_command: truncate(error[:curl_command].to_s)
+    }.to_json)
+  end
+
+  def delete_error(queue_id, msg_id, details_id)
+    iron_mq.queue("#{queue_id}-ERRORS").delete(msg_id)
+    iron_cache.queue("#{queue_id}-ERRORS").delete(details_id)
+  end
+
+  def error_details(queue_id, details_id)
+    cache = iron_cache.queue("#{queue_id}-ERRORS").get(details_id)
+    MultiJson.load(cache.body, :symbolize_keys => true)
+  end
 
-  def self.add_error(queue_id, payload)
-    self.new.iron.enqueue("#{queue_id}-ERRORS", payload)
+  def retry_error(queue_id, msg_id, details_id)
+    cache = iron_cache.queue("#{queue_id}-ERRORS").get(details_id)
+    cache_data = MultiJson.load(cache.body, :symbolize_keys => true)
+    enqueue(queue_id, cache_data[:params], cache_data[:retries] + 1)
+
+    cache.delete and iron_mq.queue("#{queue_id}-ERRORS").delete(msg_id)
+  end
+
+  def truncate(text, length=130, truncate_string='...')
+    if text
+      l = length - truncate_string.chars.length
+      chars = text.chars
+      (chars.length > length ? chars[0...l] + truncate_string : text).to_s
+    end
   end
 
+  ##########################################################################################
+
   def self.enqueue(queue_id, payload)
     self.new.enqueue(queue_id, payload)
   end
 
+  def self.add_error(queue_id, error)
+    self.new.add_error(queue_id, error)
+  end
+
   ##########################################################################################
 
   def self.run(worker_data, &code_block)
     require '.pluginenv'
     require 'iron_mq'
+    require 'iron_cache'
     require 'fanforce/api'
 
     run_validations
@@ -60,17 +101,17 @@ class Fanforce::Workers
       puts 'MESSAGE IS NIL'
       return
     end
-    task_data[:last_error] = {
-        exception: e.class.name,
-        message: e.message,
-        backtrace: e.backtrace,
-        raised_at: Time.now
-    }
-    task_data[:last_error][:curl_command] = e.curl_command if e.respond_to?(:curl_command)
-    task_data[:env_vars] = worker_data['env_vars']
-
-    puts "ADDING TO ERROR QUEUE: #{task_data.to_json}"
-    self.add_error worker_data['worker_id'], task_data
+    error = task_data.merge(
+      exception: e.class.name,
+      message: e.message,
+      backtrace: e.backtrace,
+      errored_at: Time.now,
+      env_vars: worker_data['env_vars']
+    )
+    error[:curl_command] = e.curl_command if e.respond_to?(:curl_command)
+
+    puts "ADDING TO ERROR CACHE: #{error.to_json}"
+    self.add_error worker_data['worker_id'], error
     msg.delete
     puts 'DELETED MESSAGE'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-workers
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Caleb Clark
@@ -24,20 +24,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: iron_cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +107,6 @@ files:
 - Rakefile
 - fanforce-workers.gemspec
 - lib/fanforce/workers.rb
-- lib/fanforce/workers/iron.rb
 - lib/fanforce/workers/version.rb
 - lib/fanforce/workers/workers.rb
 homepage: http://github.com/fanforce/fanforce-workers

data/lib/fanforce/workers/iron.rb

@@ -1,17 +0,0 @@
-require 'iron_mq'
-
-class Fanforce::Workers::Iron
-
-  def initialize(opts={})
-    @mq_client = IronMQ::Client.new(:token => opts[:token] || ENV['IRON_TOKEN'], :project_id => opts[:project_id] || ENV['IRON_PROJECT_ID'])
-  end
-
-  def enqueue(queue_id, payload)
-    @mq_client.queue(queue_id).post(payload.to_json)
-  end
-
-  def client
-    @mq_client
-  end
-
-end