worker-army 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 927bd98e49089fff441dad39d22b1415e72846e3
-  data.tar.gz: 543b233b40f905bac71fc9378767412de284cfe8
+  metadata.gz: bcedbff4a178a8d672661146ff5307b3c0bcbe90
+  data.tar.gz: 8d94f2c1e5e3829f18a7b9f66db5e2b65e467547
 SHA512:
-  metadata.gz: 3c8150b9f82e39b7dc5de67659166c975ef39ec8978065fa1f30b7b1842c2fc5e8f524a86093c6df9c7af281692775bb45489e089ae4d2955ce8f59eb936e97e
-  data.tar.gz: 81516c5776426b4b19030eac5ff4c722c22f0713b6c6756e9e1ff504982b77743737faf20090a6826b6630b3ec824670a800c8ad12539839c95be67b1ea32d13
+  metadata.gz: 08c8ca3a72475abfc54d1316c175503b6b66679c04bf24a0cbae3ecd52540369cae604564828a9bc163d7ec43c8dcefc15325b6a80ed4e42bc9295043a76ffba
+  data.tar.gz: 4e61962caf4ec1a08b431d798e2538f809370ff4a5a619535e5569bdb2363a159522e279bcdbff0b3c79d1e8b8e80e1cc4fa6b5554fee1eea27d1253c7a0d5b1

data/README.md

@@ -30,6 +30,7 @@ If you can't provide or don't want to provide the config file at that location,
      worker_army_worker_retry_count
      worker_army_client_retry_count
      worker_army_callback_retry_count
+     worker_army_store_job_data
 
 ## Server / Queue
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/worker_army/base.rb

@@ -1,9 +1,8 @@
 module WorkerArmy
   class Base
-    attr_accessor :config
-
     class << self
       def config
+        return $config if $config
         if ENV['worker_army_redis_host'] and ENV['worker_army_redis_port']
           config = { 'redis_host' => ENV['worker_army_redis_host'], 'redis_port' => ENV['worker_army_redis_port'] }
           if ENV['worker_army_redis_auth']
@@ -21,6 +20,9 @@ module WorkerArmy
           if ENV['worker_army_endpoint']
             config['endpoint'] = ENV['worker_army_endpoint']
           end
+          if ENV['worker_army_store_job_data']
+            config['store_job_data'] = (ENV['worker_army_store_job_data'] == 'true')
+          end
         else
           begin
             # puts "Using config in your home directory"
@@ -29,9 +31,9 @@ module WorkerArmy
             raise "worker-army configuration expected in ~/.worker_army.yml or provide env vars..."
           end
         end
-        config
+        $config = config
       end
-      
+
       def client_retry_count(conf = nil)
         if ENV['worker_army_client_retry_count']
           return ENV['worker_army_client_retry_count'].to_i
@@ -43,6 +45,10 @@ module WorkerArmy
       end
     end
 
+    def config
+      WorkerArmy::Base.config
+    end
+
     def worker_retry_count(conf = nil)
       if ENV['worker_army_worker_retry_count']
         return ENV['worker_army_worker_retry_count'].to_i

data/lib/worker_army/client.rb

@@ -9,9 +9,7 @@ module WorkerArmy
       def push_job(job_class, data = {}, callback_url = nil, queue_prefix = 'queue', retry_count = 0)
         raise "No data" unless data
         raise "No job class provided" unless job_class
-
-        @config = self.config
-        worker_army_base_url = @config['endpoint']
+        worker_army_base_url = config['endpoint']
         callback_url = "#{worker_army_base_url}/generic_callback" unless callback_url
         response = nil
         begin
@@ -25,7 +23,7 @@ module WorkerArmy
         rescue => e
           puts "Failed! Retrying (#{retry_count})..."
           retry_count += 1
-          if retry_count < client_retry_count(@config)
+          if retry_count < client_retry_count(config)
             sleep (retry_count * 2)
             push_job(job_class, data, callback_url, queue_prefix, retry_count)
           end

data/lib/worker_army/queue.rb

@@ -9,14 +9,14 @@ require File.dirname(__FILE__) + '/base'
 module WorkerArmy
   class Queue < Base
     def initialize
-      @config = self.config
+      @config = config
       Queue.redis_instance
       @log = WorkerArmy::Log.new.log
     end
 
     class << self
       def redis_instance
-        $config = self.config unless $config
+        $config = config unless $config
         unless $redis
           $redis = Redis.new(host: $config['redis_host'], port: $config['redis_port'])
         end
@@ -57,7 +57,9 @@ module WorkerArmy
       if data
         job_id = data['job_id']
         callback_url = data['callback_url']
-        Queue.redis_instance["job_#{job_id}"] = data.to_json
+        if @config['store_job_data']
+          Queue.redis_instance["job_#{job_id}"] = data.to_json
+        end
         Queue.redis_instance.lpush 'jobs', job_id
         if callback_url
           data.delete("callback_url")

data/worker-army.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: worker-army 0.4.1 ruby lib
+# stub: worker-army 0.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "worker-army"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Oliver Kiessler"]
-  s.date = "2014-05-30"
+  s.date = "2014-06-05"
   s.description = "Simple redis based worker queue with a HTTP/Rest interface"
   s.email = "kiessler@inceedo.com"
   s.executables = ["worker_army"]

data/worker_army.yml.sample

@@ -5,3 +5,4 @@ redis_auth: "YOUR_PASS"
 client_retry_count: 10
 worker_retry_count: 10
 callback_retry_count: 5
+store_job_data: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker-army
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis