home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sidekiq-memory-sigterm' into 'master'

Browse Source 
Use SIGTERM during Sidekiq memory shutdown

This makes the memory killer behave more like 'sidekiqctl stop'.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15359

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14462

See merge request !3853
This commit is contained in:
Stan Hu
2016-04-21 15:28:47 +00:00
parent 7ded28ff99 103c405339
commit ffef71d99b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gitlab/sidekiq_middleware/memory_killer.rb
+2 -2
View File
@@ -29,8 +29,8 @@ module Gitlab
"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}"