rabbit_jobs 0.8.20 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ae8280cb0507c08c0bd8603349ca504b389d986
-  data.tar.gz: 277bd310798482e364287b14530a029d6888bc13
+  metadata.gz: 01b64dc9a1dacb4d8c9bd59e049760bf13f64933
+  data.tar.gz: 17681bfe86634638d2e50ff33140a44e89123977
 SHA512:
-  metadata.gz: 6569f377bce44b954ed3de7485547294a52e246c7acda1019b23b06fa82236450106f3c0a73e5b4c425747029c3750e23a6a80f143bd23e5ae584121ce83df93
-  data.tar.gz: f8f8872fb78f74014d7767d48d169e5637bf967573c5dc3857b708c3c214da49994c56f9c11578c6217c22c7ed1994e43f7ce2b0401cd53e76c698a188b1c626
+  metadata.gz: 65c444a292677f156f2a9518bd1971e9d6da5ed9aecfabf024054dca25d9fe623d31d75065cb75602d31d1d851d9cdcee354b6443da98c3d92a8da1d0385d446
+  data.tar.gz: 4dd5ac992c47ae2f1d39f6931fe584c658c25d6449f4f1ce7867751045a401f1e7f9e184ac2258dae6ad3a80a3a1569cbdf2dae054aa74f1a0ad923a9ae8a002

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*._.*

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'actionmailer', '>= 3.0'
-
   gem 'timecop'
   gem 'rspec', '~> 2.8'
   gem 'rr'

data/lib/rabbit_jobs.rb

@@ -15,7 +15,6 @@ require 'rabbit_jobs/version'
 
 require 'rabbit_jobs/helpers'
 require 'rabbit_jobs/configuration'
-require 'rabbit_jobs/error_mailer'
 
 require 'rabbit_jobs/consumer/job_consumer'
 require 'rabbit_jobs/job'

data/lib/rabbit_jobs/configuration.rb

@@ -77,22 +77,6 @@ module RabbitJobs
       end
     end
 
-    def mail_errors_to(email = nil)
-      if email
-        @data[:mail_errors_to] = email
-      else
-        @data[:mail_errors_to]
-      end
-    end
-
-    def mail_errors_from(email = nil)
-      if email
-        @data[:mail_errors_from] = email
-      else
-        @data[:mail_errors_from]
-      end
-    end
-
     def error_log
       @data[:error_log]
     end
@@ -135,7 +119,7 @@ module RabbitJobs
       yaml = parse_environment(yaml)
 
       @data = {queues: {}}
-      %w(server mail_errors_to mail_errors_from default_queue).each do |m|
+      %w(server default_queue).each do |m|
         self.send(m, yaml[m])
       end
       yaml['queues'].each do |name, params|

data/lib/rabbit_jobs/consumer/job_consumer.rb

@@ -19,15 +19,6 @@ module RabbitJobs
         true
       end
 
-      def log_error(msg_or_exception, payload = nil)
-        if msg_or_exception.is_a?(String)
-          RJ.logger.error msg_or_exception
-        else
-          RJ.logger.error msg_or_exception.message
-          RJ.logger.error _cleanup_backtrace(msg_or_exception.backtrace).join("\n")
-        end
-      end
-
       def log_airbrake(msg_or_exception, payload)
         if defined?(Airbrake)
           if msg_or_exception.is_a?(String)
@@ -41,15 +32,12 @@ module RabbitJobs
       def report_error(error_type, *args)
         case error_type
         when :not_found
-          log_error "Cannot find job class '#{args.first}'"
+          RJ.logger.error "Cannot find job class '#{args.first}'"
         when :parsing_error
-          log_error "Cannot initialize job. Json parsing error."
-          log_error "Data received: #{args.first.inspect}"
+          RJ.logger.error "Cannot initialize job. Json parsing error. Data received: #{args.first.inspect}"
         when :error
           ex, payload = args
-          log_error "Cannot initialize job."
-          log_error ex, payload
-          log_error "Data received: #{payload.inspect}"
+          RJ.logger.error short_message: ex.message, full_message: ex.backtrace, _payload: payload.inspect
         end
       end
     end

data/lib/rabbit_jobs/helpers.rb

@@ -2,15 +2,6 @@
 
 module RabbitJobs
   module Helpers
-    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
-
     def symbolize_keys!(hash)
       hash.inject({}) do |options, (key, value)|
         options[(key.to_sym rescue key) || key] = value

data/lib/rabbit_jobs/job.rb

@@ -20,7 +20,7 @@ module RabbitJobs
         begin
           ret = nil
           execution_time = Benchmark.measure { ret = perform(*params) }
-          RabbitJobs.logger.info short_message: "Job processed [ok]", _job: self.to_ruby_string, _execution_time: execution_time.to_s.strip
+          RabbitJobs.logger.info short_message: self.to_ruby_string, _execution_time: execution_time.to_s.strip
         rescue
           log_job_error($!)
           run_on_error_hooks($!)
@@ -35,13 +35,17 @@ module RabbitJobs
               proc = self.method(proc_or_symbol)
             end
 
-            case proc.arity
-            when 0
-              proc.call()
-            when 1
-              proc.call(error)
-            else
-              proc.call(error, *params)
+            begin
+              case proc.arity
+              when 0
+                proc.call()
+              when 1
+                proc.call(error)
+              else
+                proc.call(error, *params)
+              end
+            rescue
+              RJ.logger.error($!)
             end
           end
         end
@@ -95,11 +99,10 @@ module RabbitJobs
       end
 
       def log_job_error(error)
-        RabbitJobs.logger.error(short_message: "Job processed [error]",
-          _job: self.to_ruby_string, _error: error.message, _exception: error.class, full_message: _cleanup_backtrace(error.backtrace).join("\r\n"))
+        RabbitJobs.logger.error(short_message: error.message,
+          _job: self.to_ruby_string, _exception: error.class, full_message: error.backtrace.join("\r\n"))
 
         Airbrake.notify(error, session: {args: self.to_ruby_string}) if defined?(Airbrake)
-        RabbitJobs::ErrorMailer.report_error(self, error) rescue nil
       end
     end
 
@@ -113,14 +116,14 @@ module RabbitJobs
 
       def on_error(*hooks)
         hooks.each do |proc_or_symbol|
-          raise ArgumentError unless proc_or_symbol && ( proc_or_symbol.is_a?(Proc) || proc_or_symbol.is_a?(Symbol) )
+          raise ArgumentError.new("Pass proc or symbol to on_error hook") unless proc_or_symbol && ( proc_or_symbol.is_a?(Proc) || proc_or_symbol.is_a?(Symbol) )
           @rj_on_error_hooks ||= []
           @rj_on_error_hooks << proc_or_symbol
         end
       end
 
       def queue(routing_key)
-        raise ArgumentError unless routing_key.present?
+        raise ArgumentError.new("routing_key is nil") unless routing_key.present?
         @rj_queue = routing_key.to_sym
       end
 

data/lib/rabbit_jobs/main_loop.rb

@@ -31,7 +31,7 @@ module RabbitJobs
     def log_daemon_error(error)
       if RabbitJobs.logger
         begin
-          RabbitJobs.logger.error [error.message, error.backtrace].flatten.join("\n")
+          RabbitJobs.logger.fatal error
         ensure
           abort(error.message)
         end

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -100,7 +100,7 @@ module RabbitJobs
           @processed_count += 1
         rescue
           RabbitJobs.logger.error(short_message: $!.message,
-            _payload: payload, _exception: $!.class, full_message: _cleanup_backtrace($!.backtrace).join("\r\n"))
+            _payload: payload, _exception: $!.class, full_message: $!.backtrace.join("\r\n"))
         end
         true
       else

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ end
 
 require 'rr'
 require 'timecop'
-require 'action_mailer'
 
 require 'rabbit_jobs'
 require 'fixtures/jobs'

data/spec/unit/job_consumer_spec.rb

@@ -34,13 +34,6 @@ describe RabbitJobs::Consumer::JobConsumer do
     end
   end
 
-  describe '#log_error' do
-    it 'logs error with RJ.logger' do
-      mock(RJ.logger).error("hello")
-      consumer.log_error 'hello'
-    end
-  end
-
   describe '#report_error' do
     it "accepts error type :not_found" do
       lambda { consumer.report_error(:not_found, 'klass_name') }.should_not raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.8.20
+  version: 0.9.0
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-30 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -88,7 +88,6 @@ files:
 - lib/rabbit_jobs.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
 - lib/rabbit_jobs/main_loop.rb
@@ -107,10 +106,8 @@ files:
 - spec/integration/worker_spec.rb
 - spec/spec_helper.rb
 - spec/unit/configuration_spec.rb
-- spec/unit/error_mailer_spec.rb
 - spec/unit/job_consumer_spec.rb
 - spec/unit/job_spec.rb
-- spec/unit/mailer_spec.rb
 - spec/unit/rabbit_jobs_spec.rb
 - spec/unit/worker_spec.rb
 homepage: ''

data/lib/rabbit_jobs/error_mailer.rb

@@ -1,49 +0,0 @@
-# -*- encoding : utf-8 -*-
-module RabbitJobs
-  class ErrorMailer
-    class << self
-      def enabled?
-        defined?(ActionMailer) && config_present?
-      end
-
-      def send_letter(subject, body)
-        letter         = ActionMailer::Base.mail
-        letter.from    = RabbitJobs.config.mail_errors_from
-        letter.to      = RabbitJobs.config.mail_errors_to
-        letter.subject = subject
-        letter.body    = body
-
-        letter.deliver
-      end
-
-      def report_error(job, error = $!)
-        return unless enabled?
-
-        begin
-          subject, text = build_error_message(job, error)
-          send_letter(subject, text)
-        rescue
-          RabbitJobs.logger.error $!
-        end
-      end
-
-      private
-
-      def build_error_message(job, error)
-        params = job.params || []
-
-        params_str = params.map { |p| p.inspect }.join(', ')
-        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
-        [subject, text]
-      end
-
-      def config_present?
-        config = RabbitJobs.config
-        config.mail_errors_from.present? && config.mail_errors_to.present?
-      end
-    end
-  end
-end

data/spec/unit/error_mailer_spec.rb

@@ -1,14 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe RabbitJobs::ErrorMailer do
-  describe '#report_error' do
-    it 'logs error raised in #send_letter' do
-      mock(RabbitJobs::ErrorMailer).enabled? { true }
-      mock(RabbitJobs::ErrorMailer).send_letter(anything, anything) { raise 'hello' }
-
-      mock(RabbitJobs.logger).error(anything)
-      RabbitJobs::ErrorMailer.report_error(TestJob.new, StandardError.new)
-    end
-  end
-end

data/spec/unit/mailer_spec.rb

@@ -1,27 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'spec_helper'
-
-describe RabbitJobs::ErrorMailer do
-  describe '#enabled?' do
-    it 'should be enabled when use setup email' do
-      RabbitJobs::ErrorMailer.enabled?.should == false
-      RabbitJobs.configure do |c|
-        c.mail_errors_to 'dev@example.com'
-        c.mail_errors_from 'app@example.com'
-      end
-
-      RabbitJobs::ErrorMailer.enabled?.should == true
-    end
-  end
-
-  describe '#send' do
-    it 'should send email with error' do
-      email = ActionMailer::Base.mail
-      mock(ActionMailer::Base).mail { email }
-      mock(email).deliver { }
-      mock(RabbitJobs::ErrorMailer).enabled? { true }
-
-      RabbitJobs::ErrorMailer.report_error(TestJob.new, RuntimeError.new('error text'))
-    end
-  end
-end