fanforce-plugin-worker 2.0.0.rc9 → 2.0.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ffa6265e8b082c7f9757066462721b329f5d3a
-  data.tar.gz: 962704858c259679756064bff4542f4ce018b349
+  metadata.gz: 683f1ab134ad184a10eaf72a77d470b58ff337e1
+  data.tar.gz: 19a9c9bade95b87d38bf468143265b9d3bb13f51
 SHA512:
-  metadata.gz: 0a89751ade38ad7ab91e36ba96d477a8e7d1b05803640a87c550b305894d2843b10d7b20067b703a9c4cd131a9cf7ee373c82e1a8380ee6cda5715dc94ea01b7
-  data.tar.gz: 82e3babf6a4bf39520d4057f350fec0d9d6a7b2ceee31dd8683fc9015a8d6af29cbcac3c688361c6e874c03b54f6507c30770bd4e9544c9c003cf7a426581ab5
+  metadata.gz: 57df5bd8fea25c3445ffcd03e305899619c3c1b01fd8b9b689163d8122ce7b9d92bc9ba54f0cd68a43b3a130823e74dae8e7d4f872fd4baaee8bab84ffcfef5a
+  data.tar.gz: 03eadaf69a7620da81ddc97bcd21d25968335c63d619f2cd7453dd9a869cfcede2bbca7abf19d79c6e2541b2c2454ccdb9025a98d421670f925f5676081de897

data/lib/fanforce/plugin_worker/runner_local.rb

@@ -6,7 +6,7 @@ class Fanforce::PluginWorker::RunnerLocal
   MAX_EXECUTION_TIME = 3300
   class Timeout < RuntimeError; end
 
-  def initialize(worker_data, min_execution_time=300, &code_block)
+  def initialize(worker_data, min_execution_time=300)
     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'
@@ -16,8 +16,6 @@ class Fanforce::PluginWorker::RunnerLocal
     @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)
@@ -25,9 +23,10 @@ class Fanforce::PluginWorker::RunnerLocal
     log.debug 'PROCESSING JOB...'
     log.debug '------------------------------------------------------------------------------------'
 
-    code_block.call(@current_params.clone, retries: @current_retries, queue_id: @queue_id)
+    response = code_block.call(@current_params.clone, retries: @current_retries, queue_id: @queue_id)
 
     log.debug 'WINDING DOWN WORKER!'
+    response
   end
 
 end

data/lib/fanforce/plugin_worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginWorker
-    VERSION = '2.0.0.rc9'
+    VERSION = '2.0.0.rc10'
   end
 end

data/lib/fanforce/plugin_worker/worker.rb

@@ -59,7 +59,7 @@ class Fanforce::PluginWorker
 
   def self.run(worker_data, min_execution_time=300, &code_block)
     if [true,'true'].include?(ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'])
-      RunnerLocal.new(worker_data, min_execution_time, &code_block)
+      RunnerLocal.new(worker_data, min_execution_time).run_job(&code_block)
     else
       Runner.new(worker_data, min_execution_time, &code_block)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-worker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc9
+  version: 2.0.0.rc10
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq