rabbit_jobs 0.1.14 → 0.1.15

data/lib/rabbit_jobs/error_mailer.rb

@@ -5,15 +5,13 @@ module RabbitJobs
       defined?(ActionMailer) && !!RabbitJobs.config.mail_errors_from && !RabbitJobs.config.mail_errors_from.empty?
     end
 
-    def self.send(job, error = $!)
+    def self.report_error(job, error = $!)
       return unless enabled?
 
-      raise "You must require action_mailer or turn of error reporting in config." unless defined?(ActionMailer)
-
       params ||= []
 
       params_str = job.params == [] ? '' : job.params.map { |p| p.inspect }.join(', ')
-      subject = "RJ:Worker: #{error.class} on #{job.class}.perform(#{params_str}) "
+      subject = "RJ:Worker: #{error.class} on #{job.class}"
       text    = "\n#{job.class}.perform(#{params_str})\n"
       text   += "\n#{error.inspect}\n"
       text   += "\nBacktrace:\n#{error.backtrace.join("\n")}" if error.backtrace
@@ -27,8 +25,8 @@ module RabbitJobs
       begin
         letter.deliver
       rescue
-        RJ.logger.error $!.inspect
+        RJ.logger.error [$!.message, $!.backtrace].flatten.join("\n")
       end
     end
   end
-end
+end

data/lib/rabbit_jobs/job.rb

@@ -34,7 +34,7 @@ module RabbitJobs::Job
           RJ.logger.warn(self.inspect)
           RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))
           run_on_error_hooks($!)
-          RabbitJobs::ErrorMailer.send(self, $!)
+          RabbitJobs::ErrorMailer.report_error(self, $!)
         end
         exit!
       end
@@ -112,8 +112,6 @@ module RabbitJobs::Job
       RJ.logger.error $!.inspect
       RJ.logger.error $!.backtrace
       RJ.logger.error "message: #{payload.inspect}"
-      # Mailer.send(klass_name, params, $!)
-      # raise $!
     end
   end
 end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/lib/rabbit_jobs/worker.rb

@@ -4,7 +4,7 @@ module RabbitJobs
   class Worker
     include AmqpHelpers
 
-    attr_accessor :pidfile, :background, :process_name
+    attr_accessor :pidfile, :background, :process_name, :worker_pid
 
     # Workers should be initialized with an array of string queue
     # names. The order is important: a Worker will check the first
@@ -36,59 +36,72 @@ module RabbitJobs
       $0 = self.process_name || "rj_worker (#{queues.join(',')})"
 
       processed_count = 0
-      amqp_with_exchange do |connection, exchange|
-        exchange.channel.prefetch(1)
+      RJ.logger.info("Connecting to amqp...")
 
-        check_shutdown = Proc.new {
-          if @shutdown
-            RJ.logger.info "Processed jobs: #{processed_count}"
-            RJ.logger.info "Stopping worker ##{Process.pid}..."
+      begin
+        amqp_with_exchange do |connection, exchange|
+          exchange.channel.prefetch(1)
 
-            connection.close {
-              File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
-              RJ.logger.info "##{Process.pid} stopped."
-              RJ.logger.close
+          check_shutdown = Proc.new {
+            if @shutdown
+              RJ.logger.info "Processed jobs: #{processed_count}"
+              RJ.logger.info "Stopping worker ##{Process.pid}..."
 
-              EM.stop {
-                exit!
+              connection.close {
+                File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
+                RJ.logger.info "##{Process.pid} stopped."
+                RJ.logger.close
+
+                EM.stop {
+                  exit!
+                }
               }
-            }
-          end
-        }
+            end
+          }
+
+          queues.each do |routing_key|
+            queue = make_queue(exchange, routing_key)
 
-        queues.each do |routing_key|
-          queue = make_queue(exchange, routing_key)
+            RJ.logger.info "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
 
-          RJ.logger.info "Worker ##{Process.pid} <= #{exchange.name}##{routing_key}"
+            explicit_ack = !!RJ.config[:queues][routing_key][:ack]
 
-          explicit_ack = !!RJ.config[:queues][routing_key][:ack]
+            queue.subscribe(ack: explicit_ack) do |metadata, payload|
+              @job = RJ::Job.parse(payload)
 
-          queue.subscribe(ack: explicit_ack) do |metadata, payload|
-            @job = RJ::Job.parse(payload)
+              unless @job.expired?
+                @job.run_perform
+                processed_count += 1
+              else
+                RJ.logger.info "Job expired: #{@job.inspect}"
+              end
 
-            unless @job.expired?
-              @job.run_perform
-              processed_count += 1
-            else
-              RJ.logger.info "Job expired: #{@job.inspect}"
+              metadata.ack if explicit_ack
+
+              check_shutdown.call
             end
+          end
 
-            metadata.ack if explicit_ack
+          if time > 0
+            # for debugging
+            EM.add_timer(time) do
+              self.shutdown
+            end
+          end
 
+          EM.add_periodic_timer(1) do
             check_shutdown.call
           end
         end
-
-        if time > 0
-          # for debugging
-          EM.add_timer(time) do
-            self.shutdown
+      rescue
+        error = $!
+        if RJ.logger
+          begin
+            RJ.logger.error [error.message, error.backtrace].flatten.join("\n")
+          ensure
+            abort(error.message)
           end
         end
-
-        EM.add_periodic_timer(1) do
-          check_shutdown.call
-        end
       end
 
       true
@@ -103,21 +116,18 @@ module RabbitJobs
       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
+        return false if self.worker_pid = fork
+
+        # daemonize child process
+        Process.daemon(true)
       end
 
+      self.worker_pid ||= Process.pid
+
       if self.pidfile
         File.open(self.pidfile, 'w') { |f| f << Process.pid }
       end
 
-      # Fix buffering so we can `rake rj:work > resque.log` and
-      # get output from the child in there.
       $stdout.sync = true
 
       @shutdown = false
@@ -135,13 +145,8 @@ module RabbitJobs
 
     def kill_child
       if @job && @job.child_pid
-        # RJ.logger.info "Killing child at #{@child}"
-        if Kernel.system("ps -o pid,state -p #{@job.child_pid}")
-          Process.kill("KILL", @job.child_pid) rescue nil
-        else
-          # RJ.logger.info "Child #{@child} not found, restarting."
-          # shutdown
-        end
+        RJ.logger.info "Killing child #{@job.child_pid} at #{Time.now}"
+        Process.kill("KILL", @job.child_pid) rescue nil
       end
     end
   end

data/spec/unit/mailer_spec.rb

@@ -21,7 +21,7 @@ describe RabbitJobs::ErrorMailer do
       mock(email).deliver { }
       mock(RabbitJobs::ErrorMailer).enabled? { true }
 
-      RabbitJobs::ErrorMailer.send(TestJob.new, RuntimeError.new('error text'))
+      RabbitJobs::ErrorMailer.report_error(TestJob.new, RuntimeError.new('error text'))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -224029628042723631
+      hash: 4442654216517974901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -224029628042723631
+      hash: 4442654216517974901
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24