rabbit_jobs 0.7.1 → 0.7.2

data/lib/rabbit_jobs/consumer/job_consumer.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+module RabbitJobs
+  module Consumer
+    class JobConsumer
+      def process_message(metadata, payload)
+        job = RJ::Job.parse(payload)
+
+        if job.is_a?(Symbol)
+          # case @job
+          # when :not_found
+          # when :parsing_error
+          # when :error
+          # end
+        else
+          if job.expired?
+            RJ.logger.warn "Job expired: #{job.to_ruby_string}"
+            false
+          else
+            job.run_perform
+          end
+        end
+
+        true
+      end
+    end
+  end
+end

data/lib/rabbit_jobs/scheduler.rb

@@ -7,7 +7,7 @@ require 'yaml'
 module RabbitJobs
   class Scheduler
 
-    attr_accessor :pidfile, :background, :schedule, :process_name
+    attr_accessor :schedule, :process_name
 
     def load_default_schedule
       if defined?(Rails)
@@ -106,7 +106,6 @@ module RabbitJobs
             RJ.logger.info "Processed jobs: #{processed_count}."
             RJ.logger.info "Stopped."
 
-            File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
             return true
           end
         end
@@ -130,27 +129,10 @@ module RabbitJobs
     end
 
     def startup
-      # prune_dead_workers
-      RabbitJobs::Util.check_pidfile(self.pidfile) if self.pidfile
-
-      if self.background
-        child_pid = fork
-        if child_pid
-          return false
-        else
-          # daemonize child process
-          Process.daemon(true)
-        end
-      end
-
       # Fix buffering so we can `rake rj:work > resque.log` and
       # get output from the child in there.
       $stdout.sync = true
 
-      if self.pidfile
-        File.open(self.pidfile, 'w') { |f| f << Process.pid }
-      end
-
       @shutdown = false
 
       Signal.trap('TERM') { shutdown }

data/lib/rabbit_jobs/tasks.rb

@@ -24,9 +24,10 @@ namespace :rj do
 
   desc "Start a Rabbit Jobs worker"
   task :worker => :environment do
-    queues = (ENV['QUEUES'] || ENV['QUEUES'] || "").split(',')
+    queues = (ENV['QUEUES'] || ENV['QUEUE'] || "").split(',')
     make_dirs
     worker = RJ::Worker.new(*queues)
+    worker.consumer = RJ::Consumer.const_get(ENV['CONSUMER'].classify).new if ENV['CONSUMER']
     worker.process_name = "rj_worker #{rails_env} [#{queues.join(',')}]"
     exit(worker.work)
   end

data/lib/rabbit_jobs/util.rb

@@ -4,24 +4,6 @@ module RabbitJobs
   class Util
     class << self
 
-      # clean old worker process
-      def check_pidfile(pidfile)
-        if File.exists?(pidfile)
-          pid = File.read(pidfile).to_i
-          begin
-            Process.kill(0, pid)
-            RJ.logger.info "Killing stale rj_worker[##{pid}]"
-            Process.kill("TERM", pid)
-
-            while Process.kill(0, pid)
-              sleep(0.5)
-            end
-          rescue
-            File.delete(pidfile) if File.exists?(pidfile)
-          end
-        end
-      end
-
       def cleanup_backtrace(trace_lines)
         if defined?(Rails) && Rails.respond_to?(:root)
           rails_root_path = Rails.root.to_s

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/rabbit_jobs/worker.rb

@@ -2,7 +2,13 @@
 
 module RabbitJobs
   class Worker
-    attr_accessor :pidfile, :background, :process_name, :worker_pid
+    attr_accessor :process_name
+    attr_reader :consumer
+
+    def consumer=(consumer)
+      raise ArgumentError.new("consumer=#{consumer.inspect}") unless consumer.respond_to?(:process_message)
+      @consumer = consumer
+    end
 
     def amqp_connection
       Thread.current[:rj_worker_connection] ||= AmqpHelper.prepare_connection
@@ -14,27 +20,6 @@ module RabbitJobs
       Thread.current[:rj_worker_connection] = nil
     end
 
-    def process_message(metadata, payload)
-      job = RJ::Job.parse(payload)
-
-      if job.is_a?(Symbol)
-        # case @job
-        # when :not_found
-        # when :parsing_error
-        # when :error
-        # end
-      else
-        if job.expired?
-          RJ.logger.warn "Job expired: #{job.to_ruby_string}"
-          false
-        else
-          job.run_perform
-        end
-      end
-
-      true
-    end
-
     def queue_name(routing_key)
       RJ.config.queue_name(routing_key)
     end
@@ -69,6 +54,7 @@ module RabbitJobs
     # Subscribes to queue and working on jobs
     def work(time = -1)
       return false unless startup
+      @consumer ||= RJ::Consumer::JobConsumer.new
 
       $0 = self.process_name || "rj_worker (#{queues.join(', ')})"
 
@@ -91,7 +77,8 @@ module RabbitJobs
           queue.subscribe(ack: explicit_ack) do |delivery_info, properties, payload|
             if RJ.run_before_process_message_callbacks
               begin
-                processed_count += 1 if process_message(properties, payload)
+                @consumer.process_message(properties, payload)
+                processed_count += 1
               rescue
                 RJ.logger.warn "process_message failed. payload: #{payload.inspect}"
                 RJ.logger.warn $!.inspect
@@ -123,8 +110,6 @@ module RabbitJobs
           if @shutdown
             RJ.logger.info "Processed jobs: #{processed_count}."
             RJ.logger.info "Stopped."
-
-            File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
             return true
           end
         end
@@ -147,24 +132,8 @@ module RabbitJobs
     end
 
     def startup
-      # prune_dead_workers
-      RabbitJobs::Util.check_pidfile(self.pidfile) if self.pidfile
-
-      if self.background
-        return false if self.worker_pid = fork
-
-        # daemonize child process
-        Process.daemon(true)
-      end
-
       count = RJ._run_after_fork_callbacks
 
-      self.worker_pid ||= Process.pid
-
-      if self.pidfile
-        File.open(self.pidfile, 'w') { |f| f << Process.pid }
-      end
-
       $stdout.sync = true
 
       @shutdown = false

data/lib/rabbit_jobs.rb

@@ -10,6 +10,7 @@ require 'rabbit_jobs/amqp_helper'
 require 'rabbit_jobs/configuration'
 require 'rabbit_jobs/error_mailer'
 
+require 'rabbit_jobs/consumer/job_consumer'
 require 'rabbit_jobs/job'
 require 'rabbit_jobs/publisher'
 require 'rabbit_jobs/worker'

data/rabbit_jobs.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RabbitJobs::VERSION
 
-  gem.add_dependency "bunny", "0.9.0.pre7"
+  gem.add_dependency "bunny", "0.9.0.pre8"
   gem.add_dependency "rake"
   gem.add_dependency "rufus-scheduler", "~> 2.0"
   gem.add_dependency "rails", ">= 3.0"

data/spec/integration/scheduler_spec.rb

@@ -6,9 +6,6 @@ describe RabbitJobs::Scheduler do
     scheduler = RabbitJobs::Scheduler.new
     scheduler.schedule = YAML.load_file(File.expand_path('../../fixtures/schedule.yml', __FILE__))
 
-    scheduler.pidfile = '/tmp/rj_scheduler.pid'
-    scheduler.background = false
-
     scheduler.work(10) # work for 1 second
 
     RJ.config.queue 'default', RJ::Configuration::DEFAULT_QUEUE_PARAMS

data/spec/unit/worker_spec.rb

@@ -22,17 +22,6 @@ describe RabbitJobs::Worker do
       @worker.instance_variable_get('@shutdown').should_not == true
     end
 
-    it '#startup should write process id to file' do
-      mock(Signal).trap('TERM')
-      mock(Signal).trap('INT')
-
-      filename = 'test_worker.pid'
-      mock(File).open(filename, 'w') {}
-      @worker.pidfile = filename
-      @worker.startup
-      @worker.pidfile.should == filename
-    end
-
     it '#shutdown should set @shutdown to true' do
       @worker.instance_variable_get('@shutdown').should_not == true
       @worker.shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &21380680 !ruby/object:Gem::Requirement
+  requirement: &10601260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.9.0.pre7
+        version: 0.9.0.pre8
   type: :runtime
   prerelease: false
-  version_requirements: *21380680
+  version_requirements: *10601260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &21379160 !ruby/object:Gem::Requirement
+  requirement: &10622000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21379160
+  version_requirements: *10622000
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &21374960 !ruby/object:Gem::Requirement
+  requirement: &10619420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21374960
+  version_requirements: *10619420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21399100 !ruby/object:Gem::Requirement
+  requirement: &10617700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21399100
+  version_requirements: *10617700
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -74,6 +74,7 @@ files:
 - lib/rabbit_jobs.rb
 - lib/rabbit_jobs/amqp_helper.rb
 - lib/rabbit_jobs/configuration.rb
+- lib/rabbit_jobs/consumer/job_consumer.rb
 - lib/rabbit_jobs/error_mailer.rb
 - lib/rabbit_jobs/helpers.rb
 - lib/rabbit_jobs/job.rb
@@ -111,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2351435873662003643
+      hash: 2228103642299556651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2351435873662003643
+      hash: 2228103642299556651
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11