polish #4991

sidekiq · Sep 13, 2021 · a3b4faf · a3b4faf
1 parent 582b57a
commit a3b4faf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Changes.md b/Changes.md
@@ -22,8 +22,7 @@ require "sidekiq/middleware/current_attributes"
 Sidekiq::CurrentAttributes.persist(Myapp::Current) # Your AS:CurrentAttributes singleton
 ```
 - Retry Redis operation if we get an `UNBLOCKED` Redis error. [#4985]
-- **BREAKING CHANGE** Run existing signal-handling code, if there is any, before running sidekiq's
-  signal-handling code. [#4991]
+- Run existing signal traps, if any, before running Sidekiq's trap. [#4991]
 
 6.2.2
 ---------

diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
@@ -50,8 +50,9 @@ def run(boot_app: true)
           if old_handler.respond_to?(:call)
             begin
               old_handler.call
-            rescue Exception
-              puts $!.inspect
+            rescue Exception => exc
+              # signal handlers can't use Logger so puts only
+              puts ["Error in #{sig} handler", exc].inspect
             end
           end
           self_write.puts(sig)