From bfeb9d003b6abaf34f1682c42f2fafa9ee5cc29b Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Fri, 11 Oct 2019 13:30:30 -0700
Subject: [PATCH] restore USR2 handling, fixes #4334

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

diff --git a/Changes.md b/Changes.md
index e9a05ded..be7ce529 100644
--- a/Changes.md
+++ b/Changes.md
@@ -2,6 +2,11 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
+HEAD
+---------
+
+- Fix rolling restart functionality, broken by refactoring in 6.0.0. [#4334]
+
 6.0.1
 ---------
 
diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
index f2f82d19..1b2cf44f 100644
--- a/lib/sidekiq/cli.rb
+++ b/lib/sidekiq/cli.rb
@@ -41,6 +41,8 @@ module Sidekiq
 
       self_read, self_write = IO.pipe
       sigs = %w[INT TERM TTIN TSTP]
+      # USR1 and USR2 don't work on the JVM
+      sigs << "USR2" unless jruby?
       sigs.each do |sig|
         trap sig do
           self_write.puts(sig)