dinislage/foreman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor #stop to reference ALL_PROCESSES for a bit clearer readability

Browse Source
This commit is contained in:
R. Tyler Croy
2012-04-10 20:35:59 -07:00
parent 48f764e347
commit b2bf95479e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/foreman/engine.rb
+3 -3
View File
@@ -63,7 +63,7 @@ class Foreman::Engine
def stop(name, signal='SIGTERM') def stop(name, signal='SIGTERM')
running_processes.each do |pid, process| running_processes.each do |pid, process|
unless name.nil? unless name == ALL_PROCESSES
# Comparing against process.entry.name instead of process.name to # Comparing against process.entry.name instead of process.name to
# make sure we match the process name exactly for any/all # make sure we match the process name exactly for any/all
# concurrently running processes by this name # concurrently running processes by this name
@@ -104,10 +104,10 @@ private ######################################################################
return if @terminating return if @terminating
@terminating = true @terminating = true
Timeout.timeout(5) do Timeout.timeout(5) do
stop(nil) stop ALL_PROCESSES
end end
rescue Timeout::Error rescue Timeout::Error
stop(nil, 'SIGKILL') stop(ALL_PROCESSES, 'SIGKILL')
rescue Errno::ECHILD rescue Errno::ECHILD
end end