fanforce-plugin-worker 2.0.0.rc1 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bcec6853686c192903a2134f59bb1f28da1387b
-  data.tar.gz: 4af6299cecfac5a671225b6feca4d40fea8a258c
+  metadata.gz: 987bf4bde24044a417b786303f3969d7ae4508ba
+  data.tar.gz: 8124501188c1155ce897f87e8c71597a8e50568f
 SHA512:
-  metadata.gz: b4e3670eeb9c5e46356d60a4e5e7673b28b7e11991b46d87a25c60fdc1abc5f2f357f102559b160e8f6891756ee85adba2c0b3bf80dabb65f8a2849311f8c215
-  data.tar.gz: d31f7ab8849f956912ea0776b6461714f1dd3d53f906ea37225e7f758cad12e8c95b5b9c85b42bc0420783aac3a65c1a6487b44967555469b0c4c08da7e413d0
+  metadata.gz: 582d3c4caab6618f49de0c88c0d06d3c8cb9b3101e66954928587e2f04d7cd5bca6c68f483666d59f116b350d8ec94d89d494e7c930ed5055ec3e41904ce8b35
+  data.tar.gz: f3cd3fe5510750077f41fcbb9c34986b7aac1c8febd5d32ee36d96e2e7599633072a017b00799186626dc42610ac136066f9c05bb9e68988e81a259f519f33ee

data/lib/fanforce/plugin_worker/runner.rb

@@ -32,6 +32,7 @@ class Fanforce::PluginWorker::Runner
     log.debug '------------------------------------------------------------------------------------'
     job_num = 0
     job_data = nil
+
     while job_has_enough_time_to_run and (job = Fanforce::PluginWorker.iron_mq.queue(iron_queue_id(@queue_id)).get(timeout: 3600)) do
       log.debug "- JOB #{job_num+=1}: #{job.body}"
       timeout(worker_time_remaining, Timeout) do
@@ -98,9 +99,6 @@ class Fanforce::PluginWorker::Runner
   end
 
   def job_has_enough_time_to_run
-    time_since_load = Time.now - Fanforce::PluginWorker::LOADED_AT
-    return false if time_since_load > MAX_EXECUTION_TIME
-    return false if worker_time_remaining < @min_execution_time
     return true
   end
 

data/lib/fanforce/plugin_worker/runner_local.rb

@@ -0,0 +1,33 @@
+require 'fanforce/api'
+
+class Fanforce::PluginWorker::RunnerLocal
+  include Fanforce::PluginWorker::Utils
+
+  MAX_EXECUTION_TIME = 3300
+  class Timeout < RuntimeError; end
+
+  def initialize(worker_data, min_execution_time=300, &code_block)
+    raise "min_execution_time was set to #{min_execution_time}, which is #{min_execution_time - MAX_EXECUTION_TIME} seconds too long" if min_execution_time > MAX_EXECUTION_TIME
+    log.debug '------------------------------------------------------------------------------------'
+    log.debug 'LOADING WORKER ENV'
+    ENV.each {|k,v| log.debug "#{k} = #{v}" }
+
+    worker_data = worker_data.symbolize_keys
+    @queue_id = worker_data[:queue_id] || (raise 'worker_data must contain queue_id')
+    @current_params = MultiJson.load(worker_data[:params].to_json, symbolize_keys: true)
+    @current_retries = 0
+
+    run_job(&code_block)
+  end
+
+  def run_job(&code_block)
+    log.debug '------------------------------------------------------------------------------------'
+    log.debug 'PROCESSING JOB...'
+    log.debug '------------------------------------------------------------------------------------'
+
+    code_block.call(@current_params.clone, retries: @current_retries, queue_id: @queue_id)
+
+    log.debug 'WINDING DOWN WORKER!'
+  end
+
+end

data/lib/fanforce/plugin_worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginWorker
-    VERSION = '2.0.0.rc1'
+    VERSION = '2.0.0.rc3'
   end
 end

data/lib/fanforce/plugin_worker/worker.rb

@@ -40,13 +40,31 @@ class Fanforce::PluginWorker
   def self.enqueue(queue_id, params, options={})
     raise 'Params being sent to the queue must be a Hash' if !params.is_a?(Hash)
 
-    queue_id = Utils.iron_queue_id(queue_id)
-    retries = (options[:retries].present?) ? options.delete(:retries) : 0
-    iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json, options)
+    if ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE']
+      bypass_enqueue(queue_id, params)
+    else
+      queue_id = Utils.iron_queue_id(queue_id)
+      retries = (options[:retries].present?) ? options.delete(:retries) : 0
+      iron_mq.queue(queue_id).post({params: params, retries: retries}.to_json, options)
+    end
+  end
+
+  def self.bypass_enqueue(queue_id, params)
+    config_file = "#{Plugin.base_dir}/workers/#{queue_id}.worker"
+    exec_file = "#{Plugin.base_dir}/workers/#{queue_id}.rb"
+    raise "Config file is missing: #{config_file}" if !File.exists?(config_file)
+    raise "Ruby file is missing: #{exec_file}" if !File.exists?(exec_file)
+    raise "RACK_ENV must be development: #{ENV['RACK_ENV']}" if ENV['RACK_ENV'] != 'development'
+    params = {queue_id: queue_id, params: params}
+    binding.eval(File.open(exec_file).read, exec_file)
   end
 
   def self.run(worker_data, min_execution_time=300, &code_block)
-    Runner.new(worker_data, min_execution_time, &code_block)
+    if ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE']
+      RunnerLocal.new(worker_data, min_execution_time, &code_block)
+    else
+      Runner.new(worker_data, min_execution_time, &code_block)
+    end
   end
 
 end

data/lib/fanforce/plugin_worker.rb

@@ -7,6 +7,7 @@ require_relative 'plugin_worker/utils'
 require_relative 'plugin_worker/worker'
 require_relative 'plugin_worker/errors'
 require_relative 'plugin_worker/runner'
+require_relative 'plugin_worker/runner_local' if ENV['RACK_ENV'] == 'development'
 
 ########################################################################################################################
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-worker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq
@@ -140,6 +140,7 @@ files:
 - lib/fanforce/plugin_worker.rb
 - lib/fanforce/plugin_worker/errors.rb
 - lib/fanforce/plugin_worker/runner.rb
+- lib/fanforce/plugin_worker/runner_local.rb
 - lib/fanforce/plugin_worker/utils.rb
 - lib/fanforce/plugin_worker/version.rb
 - lib/fanforce/plugin_worker/worker.rb