rabbit_jobs 0.2.0.pre3 → 0.2.0.pre4

data/lib/rabbit_jobs/job.rb

@@ -22,7 +22,8 @@ module RabbitJobs::Job
         self.class.perform(*params)
       rescue
         RJ.logger.warn(self.inspect)
-        RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))
+        RJ.logger.warn $!.message
+        RJ.logger.warn RJ::Util.cleanup_backtrace($!.backtrace).join("\n")
         run_on_error_hooks($!)
         RabbitJobs::ErrorMailer.report_error(self, $!)
       end
@@ -100,8 +101,8 @@ module RabbitJobs::Job
       :not_found
     rescue
       RJ.logger.error "JOB INIT ERROR at #{Time.now.to_s}:"
-      RJ.logger.error $!.inspect
-      RJ.logger.error $!.backtrace
+      RJ.logger.warn $!.message
+      RJ.logger.warn RJ::Util.cleanup_backtrace($!.backtrace).join("\n")
       RJ.logger.error "message: #{payload.inspect}"
       nil
     end

data/lib/rabbit_jobs/util.rb

@@ -1,21 +1,36 @@
 # -*- encoding : utf-8 -*-
 
-module RabbitJobs::Util
-  # clean old worker process
-  def self.check_pidfile(pidfile)
-    if File.exists?(pidfile)
-      pid = File.read(pidfile).to_i
-      begin
-        Process.kill(0, pid)
-        RJ.logger.info "Killing old rabbit_jobs process ##{pid}"
-        Process.kill("TERM", pid)
+module RabbitJobs
+  class Util
+    class << self
 
-        while Process.kill(0, pid)
-          sleep(0.5)
+      # 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 old rabbit_jobs process ##{pid}"
+            Process.kill("TERM", pid)
+
+            while Process.kill(0, pid)
+              sleep(0.5)
+            end
+          rescue
+            File.delete(pidfile) if File.exists?(pidfile)
+          end
         end
-      rescue
-        File.delete(pidfile) if File.exists?(pidfile)
       end
+
+      def cleanup_backtrace(trace_lines)
+        if defined?(Rails) && Rails.respond_to?(:root)
+          rails_root_path = Rails.root.to_s
+          trace_lines.dup.keep_if { |l| l[rails_root_path] }
+        else
+          trace_lines
+        end
+      end
+
     end
   end
 end

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 module RabbitJobs
-  VERSION = "0.2.0.pre3"
+  VERSION = "0.2.0.pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre3
+  version: 0.2.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &9438720 !ruby/object:Gem::Requirement
+  requirement: &16470020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *9438720
+  version_requirements: *16470020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9450940 !ruby/object:Gem::Requirement
+  requirement: &16499220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9450940
+  version_requirements: *16499220
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &9444480 !ruby/object:Gem::Requirement
+  requirement: &16496980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9444480
+  version_requirements: *16496980
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -98,7 +98,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4291457465904043051
+      hash: 2644135263764461757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: