From 103c4053390dd05af5f97c608ed81d196225f933 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 21 Apr 2016 14:49:15 +0200
Subject: [PATCH] Use SIGTERM during Sidekiq memory shutdown

This makes the memory killer behave more like 'sidekiqctl stop'.
---
 lib/gitlab/sidekiq_middleware/memory_killer.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb
index 372327433252..ae85b294d315 100644
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -29,8 +29,8 @@ def call(worker, job, queue)
             "in #{GRACE_TIME} seconds"
           sleep(GRACE_TIME)
 
-          Sidekiq.logger.warn "sending SIGUSR1 to PID #{Process.pid}"
-          Process.kill('SIGUSR1', Process.pid)
+          Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid}"
+          Process.kill('SIGTERM', Process.pid)
 
           Sidekiq.logger.warn "waiting #{SHUTDOWN_WAIT} seconds before sending "\
             "#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"
-- 
GitLab