fanforce-worker 0.35.0 → 0.36.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1b9b32f5062c0b82d44841919dc62479f20f3c60
+  data.tar.gz: 61303a46648b8c7aacc7cb87f14c70eef6e663e0
+SHA512:
+  metadata.gz: 03d68fde6b54d8dca125e1935164ab30ecb47bd510489daca4c84f6c08418f4b82410c470aaadb29d891b2c338dacb43f3e1f8da3ad76326eb8e11e671b444d2
+  data.tar.gz: 9910d5478787358e79688254e7841a48c0ad6d6ce985b376c450e4823eb5abda2c3558f16d4747d568a013158a4c5d34a6168661d7de06a9008ee126fd54ac98

data/lib/fanforce/worker/runner.rb

@@ -10,6 +10,7 @@ class Fanforce::Worker::Runner
 
   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'
 
     @queue_id = worker_data['queue_id'] || (raise 'worker_data must contain queue_id')
@@ -18,11 +19,15 @@ class Fanforce::Worker::Runner
     @min_execution_time = min_execution_time
     @code_block = code_block
 
-    load_env
+    load_env_from_server
+    load_env_from_worker(@worker_env)
+    ENV.each {|k,v| log.debug "#{k} = #{v}" }
+
     load_jobs
   end
 
   def load_jobs
+    log.debug '------------------------------------------------------------------------------------'
     log.debug 'PROCESSING JOBS...'
     log.debug '------------------------------------------------------------------------------------'
     job_num = 0
@@ -44,7 +49,7 @@ class Fanforce::Worker::Runner
     handle_job_loading_error(e, job, job_data)
   end
 
-  def load_env
+  def load_env_from_server
     if File.exists?('.developmentenv.rb')
       require '.developmentenv'
     elsif File.exists?('.stagingenv.rb')
@@ -54,12 +59,15 @@ class Fanforce::Worker::Runner
     end
   end
 
+  def load_env_from_worker(vars)
+    vars.each {|k,v| ENV[k.to_s]=v }
+  end
+
   def run_job(job, job_data, &code_block)
     @current_job = job
     @current_params  = job_data[:params]
     @current_retries = job_data[:retries]
 
-    set_env_vars(@worker_env)
     code_block.call(job_data[:params].clone, retries: job_data[:retries], queue_id: @queue_id)
     delete_job(job)
 
@@ -96,10 +104,6 @@ class Fanforce::Worker::Runner
     return true
   end
 
-  def set_env_vars(vars)
-    vars.each {|k,v| ENV[k.to_s]=v }
-  end
-
   def delete_job(job=nil)
     return if job.nil? and @current_job.nil?
     (job || @current_job).delete

data/lib/fanforce/worker/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class Worker
-    VERSION = '0.35.0'
+    VERSION = '0.36.0'
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-worker
 version: !ruby/object:Gem::Version
-  version: 0.35.0
-  prerelease: 
+  version: 0.36.0
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-12 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_cache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fanforce-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -130,33 +117,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/fanforce/fanforce-worker
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4268920817357779602
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4268920817357779602
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fanforce worker used by various Fanforce apps for background processing.
 test_files:
 - test/controllers/enqueue_test.rb