Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
103c4053
Commit
103c4053
authored
Apr 21, 2016
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use SIGTERM during Sidekiq memory shutdown
This makes the memory killer behave more like 'sidekiqctl stop'.
parent
53534682
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/sidekiq_middleware/memory_killer.rb
lib/gitlab/sidekiq_middleware/memory_killer.rb
+2
-2
No files found.
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
103c4053
...
@@ -29,8 +29,8 @@ module Gitlab
...
@@ -29,8 +29,8 @@ module Gitlab
"in
#{
GRACE_TIME
}
seconds"
"in
#{
GRACE_TIME
}
seconds"
sleep
(
GRACE_TIME
)
sleep
(
GRACE_TIME
)
Sidekiq
.
logger
.
warn
"sending SIG
USR1
to PID
#{
Process
.
pid
}
"
Sidekiq
.
logger
.
warn
"sending SIG
TERM
to PID
#{
Process
.
pid
}
"
Process
.
kill
(
'SIG
USR1
'
,
Process
.
pid
)
Process
.
kill
(
'SIG
TERM
'
,
Process
.
pid
)
Sidekiq
.
logger
.
warn
"waiting
#{
SHUTDOWN_WAIT
}
seconds before sending "
\
Sidekiq
.
logger
.
warn
"waiting
#{
SHUTDOWN_WAIT
}
seconds before sending "
\
"
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
"
"
#{
SHUTDOWN_SIGNAL
}
to PID
#{
Process
.
pid
}
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment