worker-army 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcedbff4a178a8d672661146ff5307b3c0bcbe90
-  data.tar.gz: 8d94f2c1e5e3829f18a7b9f66db5e2b65e467547
+  metadata.gz: d99e9dc0f645797ece237c3c921c8347ef296704
+  data.tar.gz: a6a474a23035b5aadcb5429bbba28b04155dbb06
 SHA512:
-  metadata.gz: 08c8ca3a72475abfc54d1316c175503b6b66679c04bf24a0cbae3ecd52540369cae604564828a9bc163d7ec43c8dcefc15325b6a80ed4e42bc9295043a76ffba
-  data.tar.gz: 4e61962caf4ec1a08b431d798e2538f809370ff4a5a619535e5569bdb2363a159522e279bcdbff0b3c79d1e8b8e80e1cc4fa6b5554fee1eea27d1253c7a0d5b1
+  metadata.gz: 393216db68a6b8a97d091750bf12ee5e5fe532cf16de6ceb3e63bce3e495869e3ba5b576c26f5c5959a0f8537bdffee01b39b748e8baa82123c59ff9dc54cf3a
+  data.tar.gz: 2cc3f0ad6f50383db1a026d4b4afa99e0de14e62d2ba48fa6e0c5be1931acde14da565d321a34a208f6735103d97533562c40c1ca8b2a8785f7860164104165b

data/README.md

@@ -42,7 +42,7 @@ or use Foreman (checkout `Procfile`)
 
     $ foreman start
 
-You easily run the worker-army server on heroku. It should work out of the box. You're just going to have provide the configuration environment variables.
+You easily run the worker-army server on heroku. It should work out of the box (you'll need to setup a redis database though). You're just going to have provide the configuration environment variables.
 
 You can open the server status overview by calling the server root url:
 
@@ -64,9 +64,9 @@ Provide an (optional) URL as the last argument and worker-army will return the j
 
 ## Workers
 
-You can start up a worker with a job class assigned with the following:
+You can start up a worker with numerous job classes assigned to it with the following:
 
-    $ rake start_worker[ExampleJob]
+    $ rake start_worker[ExampleJob,AnotherJob]
 
 ## Jobs
 

data/Rakefile

@@ -42,14 +42,17 @@ Rake::RDocTask.new do |rdoc|
 end
 
 require File.dirname(__FILE__) + '/lib/worker-army'
-task 'start_example_worker' do
-  WorkerArmy::Worker.new(ExampleJob.new).process_queue
+task 'start_example_workers' do
+  WorkerArmy::Worker.new([ExampleJob.new, AnotherJob.new]).process_queue
 end
 
-desc "Start a worker-army worker to execute a job class"
-task :start_worker, :job_class do |t, args|
-  if args[:job_class]
-    clazz = Object.const_get(args[:job_class].to_s)
-    WorkerArmy::Worker.new(clazz.new).process_queue
+desc "Start a worker-army worker to execute job classes"
+task :start_worker, :job_classes do |t, args|
+  if args[:job_classes]
+    clazzes = []
+    args[:job_classes].to_s.split(",").each do |jc|
+      clazzes << Object.const_get(jc.lstrip.rstrip).new
+    end
+    WorkerArmy::Worker.new(clazzes).process_queue
   end
 end

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/worker-army.rb

@@ -7,3 +7,4 @@ require File.dirname(__FILE__) + '/worker_army/queue'
 require File.dirname(__FILE__) + '/worker_army/worker'
 require File.dirname(__FILE__) + '/worker_army/client'
 require File.dirname(__FILE__) + '/worker_army/example_job'
+require File.dirname(__FILE__) + '/worker_army/another_job'

data/lib/worker_army/another_job.rb

@@ -0,0 +1,10 @@
+class AnotherJob
+  attr_accessor :log
+
+  def perform(data = {})
+    response_data = {foo2: 'bar2'}
+    log.debug("in another job with data: #{data}")
+    sleep 2
+    response_data
+  end
+end

data/lib/worker_army/example_job.rb

@@ -3,7 +3,7 @@ class ExampleJob
 
   def perform(data = {})
     response_data = {foo: 'bar'}
-    log.debug("in example worker with data: #{data}")
+    log.debug("in example job with data: #{data}")
     sleep 2
     response_data
   end

data/lib/worker_army/queue.rb

@@ -48,9 +48,9 @@ module WorkerArmy
         queue_name: queue_name }
     end
 
-    def pop(job_class_name, queue_prefix = "queue")
+    def pop(job_instances, queue_prefix = "queue")
       raise "No redis connection!" unless Queue.redis_instance
-      return Queue.redis_instance.blpop("#{queue_prefix}_#{job_class_name}")
+      return Queue.redis_instance.blpop(job_instances.collect {|j| "#{queue_prefix}_#{j.class.name}"})
     end
 
     def save_result(data)

data/lib/worker_army/worker.rb

@@ -6,26 +6,33 @@ require File.dirname(__FILE__) + '/base'
 
 module WorkerArmy
   class Worker < Base
-    attr_accessor :queue, :job, :worker_name, :processed, :failed
-    def initialize(job, worker_name = nil)
+    attr_accessor :queue, :jobs, :job_names, :worker_name, :processed, :failed
+    def initialize(jobs, worker_name = nil)
       @queue = WorkerArmy::Queue.new
-      @job = job
+      @log = WorkerArmy::Log.new.log
+      @job_names = []
+      @jobs = jobs
+      if @jobs and @jobs.size > 0
+        @jobs.each do |job|
+          job.log = @log if job.respond_to?(:log)
+          @job_names << job.class.name
+        end
+      end
+      @job_names = @job_names.uniq
       @worker_name = worker_name
       @host_name = Socket.gethostname
       @processed = 0
       @failed = 0
       @config = self.config
-      @log = WorkerArmy::Log.new.log
     end
 
     def process_queue
-      raise "No job class set!" unless @job
-      @job.log = @log if @job.respond_to?(:log)
-      @queue.ping(worker_pid: Process.pid, job_name: @job.class.name, host_name: @host_name,
+      raise "No job classes set!" if @jobs.nil? or @jobs.size == 0
+      @queue.ping(worker_pid: Process.pid, job_names: @job_names.join(", "), host_name: @host_name,
         timestamp: Time.now.utc.to_i)
-      @log.info("Worker #{@host_name}-#{Process.pid} => Queue: queue_#{@job.class.name}")
+      @job_names.each {|job| @log.info("Worker #{@host_name}-#{Process.pid} => Queue: queue_#{job.class.name}")}
       @log.info("Worker #{@host_name}-#{Process.pid} => Processed: #{@processed} - Failed: #{@failed}")
-      list, element = @queue.pop(@job.class.name)
+      list, element = @queue.pop(@jobs)
       if list and element
         execute_job(list, element, 0)
       end
@@ -40,10 +47,10 @@ module WorkerArmy
         data = JSON.parse(element)
         job_id = data['job_id']
         callback_url = data['callback_url']
-        if @job and @job.class.name == data['job_class']
+        if @jobs and @job_names.include?(data['job_class'])
           @queue.add_current_job(job_id)
           started_at = Time.now.utc.to_i
-          response_data = @job.perform(data)
+          response_data = @jobs.select {|j| j.class.name == data['job_class']}.first.perform(data)
           response_data = {} unless response_data
           if callback_url and not callback_url.empty?
             response_data.merge!(callback_url: 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.5.0 ruby lib
+# stub: worker-army 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "worker-army"
-  s.version = "0.5.0"
+  s.version = "0.6.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-06-05"
+  s.date = "2014-07-24"
   s.description = "Simple redis based worker queue with a HTTP/Rest interface"
   s.email = "kiessler@inceedo.com"
   s.executables = ["worker_army"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "bin/worker_army",
     "config.ru",
     "lib/worker-army.rb",
+    "lib/worker_army/another_job.rb",
     "lib/worker_army/base.rb",
     "lib/worker_army/client.rb",
     "lib/worker_army/example_job.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker-army
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -171,6 +171,7 @@ files:
 - bin/worker_army
 - config.ru
 - lib/worker-army.rb
+- lib/worker_army/another_job.rb
 - lib/worker_army/base.rb
 - lib/worker_army/client.rb
 - lib/worker_army/example_job.rb