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
Boxiang Sun
gitlab-ce
Commits
12bc7e0b
Commit
12bc7e0b
authored
Mar 07, 2019
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Sidekiq process group killing
parent
7bbdb2a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
lib/gitlab/sidekiq_signals.rb
lib/gitlab/sidekiq_signals.rb
+5
-2
spec/lib/gitlab/sidekiq_signals_spec.rb
spec/lib/gitlab/sidekiq_signals_spec.rb
+1
-1
No files found.
lib/gitlab/sidekiq_signals.rb
View file @
12bc7e0b
...
...
@@ -35,8 +35,11 @@ module Gitlab
# signals from outside the process group, but that isn't fatal.
def
self
.
blindly_signal_pgroup!
(
signal
)
old_trap
=
trap
(
signal
,
'IGNORE'
)
Process
.
kill
(
signal
,
"-
#{
Process
.
getpgrp
}
"
)
trap
(
signal
,
old_trap
)
begin
Process
.
kill
(
signal
,
0
)
ensure
trap
(
signal
,
old_trap
)
end
end
end
end
spec/lib/gitlab/sidekiq_signals_spec.rb
View file @
12bc7e0b
...
...
@@ -44,7 +44,7 @@ describe Gitlab::SidekiqSignals do
expect
(
Process
)
.
to
receive
(
:kill
)
.
with
(
signal
,
"-
#{
Process
.
pid
}
"
)
.
with
(
signal
,
0
)
.
ordered
expect
(
described_class
)
...
...
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