Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sigterm misbehavior #2629

Merged
merged 3 commits into from May 20, 2021
Merged

Fix sigterm misbehavior #2629

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f70585
Log error if worker can not be started
ye-lin-aung May 12, 2021
3019cce
Removed sleeping of worker
ye-lin-aung May 12, 2021
f893c57
Runned rubocop
ye-lin-aung May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/puma/cluster/worker.rb
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ def run
Signal.trap "SIGINT", "IGNORE"
Signal.trap "SIGCHLD", "DEFAULT"

Thread.new do
Thread.new do
Puma.set_thread_name "worker check pipe"
IO.select [@check_pipe]
log "! Detected parent died, dying"
Expand All @@ -54,7 +54,14 @@ def run
# things in shape before booting the app.
@launcher.config.run_hooks :before_worker_boot, index, @launcher.events

begin
server = @server ||= start_server
rescue Exception => e
log "! Unable to start worker"
log e.backtrace[0]
exit 1
end

restart_server = Queue.new << true << false

fork_worker = @options[:fork_worker] && index == 0
Expand Down