From a3b4fafdbb022646dd6c8f4625ccd5fcffc53a8d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Mon, 13 Sep 2021 09:33:57 -0700
Subject: [PATCH] polish #4991

---
 Changes.md         | 3 +--
 lib/sidekiq/cli.rb | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changes.md b/Changes.md
index e5b66acea..1043db4dd 100644
--- 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
index 8398759df..5b2ee6355 100644
--- 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)