From fe323f988cc8a07c923a001871bccc0ba3315d90 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Mon, 17 Sep 2018 11:49:01 -0700
Subject: [PATCH] Bump shutdown timeout to 25 seconds, fixes #3968

---
 bin/sidekiqctl | 2 +-
 lib/sidekiq.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/sidekiqctl b/bin/sidekiqctl
index 297b3496..cc81ccce 100755
--- a/bin/sidekiqctl
+++ b/bin/sidekiqctl
@@ -4,7 +4,7 @@ require 'fileutils'
 require 'sidekiq/api'
 
 class Sidekiqctl
-  DEFAULT_KILL_TIMEOUT = 10
+  DEFAULT_KILL_TIMEOUT = 30
   CMD = File.basename($0)
 
   attr_reader :stage, :pidfile, :kill_timeout
diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index 2aaeff68..a7938b8d 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -21,7 +21,7 @@ module Sidekiq
     concurrency: 10,
     require: '.',
     environment: nil,
-    timeout: 8,
+    timeout: 25,
     poll_interval_average: nil,
     average_scheduled_poll_interval: 5,
     error_handlers: [],