fanforce-plugin-worker 2.0.0.rc11 → 2.0.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83a44c80d188889bc6624e719bb97ec7a1bbbf0b
-  data.tar.gz: 399f51d4a1d285addae3de4471ad2ca85f5394e0
+  metadata.gz: e756e918d0ff2a7dc9070491506c6e61042f56f5
+  data.tar.gz: 5c88d554a6bf80df472c8af395665fe96f645d38
 SHA512:
-  metadata.gz: 8c2ce08084ebba9183f5572e6151b4e8b9dd764bcfef7c035b3835af001e1f2963d83123b483213dfabc356a111245870f57e97c92935b8344ef2d6e30519b61
-  data.tar.gz: 5e3b914eaf0ba4a145d990f800a43111835911ec436db3fb4f55d079ddc75c5d7add3a12fa245fdedf104516d50f593771b99d251f0bf181b1962d19fbb8a7f0
+  metadata.gz: e59fab71af38e7301e2e890948f5dae785949464c3896ab2973283e2a7e745a0c5c03981283657a0832f1c67d2e4319c10213fd0541585c5276cc2b65227044d
+  data.tar.gz: 8d377a77dd2eebcd53477a974ebdde7aa13893fd4334aa3fb86c48a9882a33eab93f30e74b93bf93ba89e3061977c866f70fb06ee574a584616431cc24c8f293

data/fanforce-plugin-worker.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'uuid',           '~> 2.3.7'
   gem.add_runtime_dependency 'activesupport',  '~> 4.1.6'
   gem.add_runtime_dependency 'redis',          '~> 3.1.0'
-  gem.add_runtime_dependency 'multi_json',     '>= 1.7.2'
 
   gem.add_runtime_dependency 'rest_client',    '= 1.7.3'
 

data/lib/fanforce/plugin_worker.rb

@@ -19,6 +19,7 @@ if ENV['PWD'] == '/mnt/task'
 
   Plugin = Fanforce::Plugin
   PluginWorker = Fanforce::PluginWorker
+  PluginWorker.is_iron_worker(true)
 
   # When running in Docker, IronWorker no longer provides the params method
   def params; IronWorker.payload end

data/lib/fanforce/plugin_worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class PluginWorker
-    VERSION = '2.0.0.rc11'
+    VERSION = '2.0.0.rc12'
   end
 end

data/lib/fanforce/plugin_worker/worker.rb

@@ -7,6 +7,15 @@ class Fanforce::PluginWorker
   @@log = Logger.new($stdout)
   @@log.datetime_format = '%H:%M:%S'
   @@log.formatter = proc do |severity, datetime, prog_name, msg| "#{datetime}: #{msg}\n" end
+  @@is_iron_worker = false
+
+  def self.is_iron_worker(bool)
+    @@is_iron_worker = bool
+  end
+
+  def self.is_iron_worker?
+    @@is_iron_worker
+  end
 
   def self.iron_token
     @@iron[:token] || ENV['IRON_TOKEN']
@@ -40,8 +49,8 @@ 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)
 
-    if [true,'true'].include?(ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'])
-      bypass_enqueue(queue_id, params)
+    if [true,'true'].include?(ENV['FANFORCE_WORKER_SHOULD_RUN_LOCALLY_AND_INSTANTLY']) and !is_iron_worker?
+      run_locally_and_instantly(queue_id, params)
     else
       queue_id = Utils.iron_queue_id(queue_id)
       retries = (options[:retries].present?) ? options.delete(:retries) : 0
@@ -49,7 +58,7 @@ class Fanforce::PluginWorker
     end
   end
 
-  def self.bypass_enqueue(queue_id, params)
+  def self.run_locally_and_instantly(queue_id, params)
     exec_file = "#{Plugin.base_dir}/workers/#{queue_id}.rb"
     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'
@@ -58,7 +67,7 @@ class Fanforce::PluginWorker
   end
 
   def self.run(worker_data, min_execution_time=300, &code_block)
-    if [true,'true'].include?(ENV['FANFORCE_WORKER_SHOULD_BYPASS_ENQUEUE'])
+    if [true,'true'].include?(ENV['FANFORCE_WORKER_SHOULD_RUN_LOCALLY_AND_INSTANTLY']) and !is_iron_worker?
       RunnerLocal.new(worker_data, min_execution_time).run_job(&code_block)
     else
       Runner.new(worker_data, min_execution_time, &code_block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-plugin-worker
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc11
+  version: 2.0.0.rc12
 platform: ruby
 authors:
 - Caleb Clark
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rest_client
   requirement: !ruby/object:Gem::Requirement