Skip to content

Update pitchfork master_pid regex to avoid self-reference shell pid #306

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

Merged
Flink merged 3 commits into from
Mar 10, 2026
Merged

Update pitchfork master_pid regex to avoid self-reference shell pid #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ae9908
Update pitchfork master_pid regex to avoid self-reference shell pid
dobon Mar 1, 2026
a4ff3e1
Merge branch 'discourse:main' into patch-1
dobon Mar 10, 2026
f620ae5
code review changes
dobon Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/docker_manager/pitchfork_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def launcher_pid
end

def master_pid
`pgrep -f "pitchfork monitor"`.strip.to_i
`pgrep -f "^pitchfork monitor"`.strip.to_i
Comment thread
dobon marked this conversation as resolved.
end
end
end
2 changes: 1 addition & 1 deletion lib/docker_manager/unicorn_adapter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def launcher_pid
end

def master_pid
`pgrep -f "unicorn master -E"`.strip.to_i
`pgrep -f "^unicorn master -E"`.strip.to_i
end
end
end
2 changes: 1 addition & 1 deletion spec/lib/docker_manager/pitchfork_adapter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

describe "#master_pid" do
before do
allow_any_instance_of(Kernel).to receive(:`).with('pgrep -f "pitchfork monitor"').and_return(
allow_any_instance_of(Kernel).to receive(:`).with('pgrep -f "^pitchfork monitor"').and_return(
"5678\n",
)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/docker_manager/unicorn_adapter_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

describe "#master_pid" do
before do
allow_any_instance_of(Kernel).to receive(:`).with('pgrep -f "unicorn master -E"').and_return(
allow_any_instance_of(Kernel).to receive(:`).with('pgrep -f "^unicorn master -E"').and_return(
"5678\n",
)
end
Expand Down