From 1d11ae3a01d12cc67ff6d31dc7e09143000e733b Mon Sep 17 00:00:00 2001 From: Mike Perham Date: Mon, 13 Jan 2020 15:46:55 -0800 Subject: [PATCH] Some issues found with type checking, fixes #4429 --- lib/sidekiq/logger.rb | 2 +- lib/sidekiq/processor.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sidekiq/logger.rb b/lib/sidekiq/logger.rb index 40c30335..f1c8e5ab 100644 --- a/lib/sidekiq/logger.rb +++ b/lib/sidekiq/logger.rb @@ -83,7 +83,7 @@ module Sidekiq # Redefined to check severity against #level, and thus the thread-local level, rather than +@level+. # FIXME: Remove when the minimum Ruby version supports overriding Logger#level. def add(severity, message = nil, progname = nil, &block) - severity ||= UNKNOWN + severity ||= ::Logger::UNKNOWN progname ||= @progname return true if @logdev.nil? || severity < level diff --git a/lib/sidekiq/processor.rb b/lib/sidekiq/processor.rb index afba3d72..2ae5c2c0 100644 --- a/lib/sidekiq/processor.rb +++ b/lib/sidekiq/processor.rb @@ -181,7 +181,7 @@ module Sidekiq # the retry subsystem (e.g. network partition). We won't acknowledge the job # so it can be rescued when using Sidekiq Pro. handle_exception(ex, {context: "Internal exception!", job: job_hash, jobstr: jobstr}) - raise e + raise ex ensure if ack # We don't want a shutdown signal to interrupt job acknowledgment.