rabbit_jobs 0.1.7 → 0.1.8

data/lib/rabbit_jobs/configuration.rb

@@ -75,7 +75,7 @@ module RabbitJobs
     def mail_errors_to(email = nil, from_email = nil)
       if email && from_email
         @data[:mail_errors_to] = email
-        @data[:mail_errors_form] = from_email
+        @data[:mail_errors_from] = from_email
       else
         @data[:mail_errors_to]
       end
@@ -102,7 +102,7 @@ module RabbitJobs
         raise ArgumentError unless value.is_a?(String) && value != ""
         @data[:url] = value.to_s
       else
-        @data[:url]
+        @data[:url] || 'amqp://localhost'
       end
     end
 

data/lib/rabbit_jobs/error_mailer.rb

@@ -1,9 +1,8 @@
 # -*- encoding : utf-8 -*-
-
 module RabbitJobs
   class ErrorMailer
     def self.enabled?
-      !!RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty?
+      defined?(ActionMailer) && !!RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty?
     end
 
     def self.send(job, error = $!)

data/lib/rabbit_jobs/tasks.rb

@@ -21,7 +21,7 @@ namespace :rj do
     queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
     worker = initialize_rj_daemon(RJ::Worker.new(*queues))
 
-    worker.work
+    exit(0) if worker.work
   end
 
   desc "Start a Rabbit Jobs scheduler"

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/rabbit_jobs/worker.rb

@@ -4,7 +4,7 @@ module RabbitJobs
   class Worker
     include AmqpHelpers
 
-    attr_accessor :pidfile, :background
+    attr_accessor :pidfile, :background, :process_name
 
     # Workers should be initialized with an array of string queue
     # names. The order is important: a Worker will check the first
@@ -30,7 +30,9 @@ module RabbitJobs
 
     # Subscribes to channel and working on jobs
     def work(time = 0)
-      startup
+      return false unless startup
+
+      $0 = self.process_name || "rj_worker (#{queues.join(',')})"
 
       processed_count = 0
       amqp_with_exchange do |connection, exchange|
@@ -39,13 +41,15 @@ module RabbitJobs
         check_shutdown = Proc.new {
           if @shutdown
             RJ.logger.info "Processed jobs: #{processed_count}"
-            RJ.logger.info "Stopping worker..."
+            RJ.logger.info "Stopping worker ##{Process.pid}..."
 
             connection.close {
-              File.delete(self.pidfile) if self.pidfile
+              File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
+              RJ.logger.info "##{Process.pid} stopped."
+              RJ.logger.close
+
               EM.stop {
                 exit!
-                RJ.logger.close
               }
             }
           end
@@ -85,6 +89,8 @@ module RabbitJobs
           check_shutdown.call
         end
       end
+
+      true
     end
 
     def shutdown
@@ -94,7 +100,15 @@ module RabbitJobs
     def startup
       # prune_dead_workers
 
-      Process.daemon(true) if self.background
+      if self.background
+        child_pid = fork
+        if child_pid
+          return false
+        else
+          # daemonize child process
+          Process.daemon(true)
+        end
+      end
 
       if self.pidfile
         File.open(self.pidfile, 'w') { |f| f << Process.pid }
@@ -108,6 +122,8 @@ module RabbitJobs
 
       Signal.trap('TERM') { shutdown }
       Signal.trap('INT')  { shutdown! }
+
+      true
     end
 
     def shutdown!

data/spec/unit/mailer_spec.rb

@@ -7,8 +7,9 @@ describe RabbitJobs::ErrorMailer do
     it 'should be enabled when use setup email' do
       RabbitJobs::ErrorMailer.enabled?.should == false
       RabbitJobs.configure do |c|
-        c.mail_errors_to 'dev@exampe.com', 'app@example.com'
+        c.mail_errors_to 'dev@example.com', 'app@example.com'
       end
+      puts RJ.config.inspect
       RabbitJobs::ErrorMailer.enabled?.should == true
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70239702675840 !ruby/object:Gem::Requirement
+  requirement: &70342786851260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70239702675840
+  version_requirements: *70342786851260
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70239702675060 !ruby/object:Gem::Requirement
+  requirement: &70342786849100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70239702675060
+  version_requirements: *70342786849100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239702674400 !ruby/object:Gem::Requirement
+  requirement: &70342786847880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239702674400
+  version_requirements: *70342786847880
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70239702661400 !ruby/object:Gem::Requirement
+  requirement: &70342786843880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239702661400
+  version_requirements: *70342786843880
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -106,12 +106,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2902232038972614332
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2902232038972614332
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15