Skip to content

Commit

Permalink
Merge pull request mojombo#74 from shr3kst3r/fix-newlines
Browse files Browse the repository at this point in the history
Newlines were removed from self.stop_all in god.rb, which caused malform...
  • Loading branch information
mojombo committed Dec 30, 2011
2 parents 6c063e5 + ad5e149 commit 6300d5b
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions lib/god.rb
Expand Up @@ -470,8 +470,13 @@ def self.control(name, command)
#
# Returns true on success, false if all tasks could not be stopped within 10
# seconds
def self.stop_all self.watches.sort.each do |name, w| Thread.new do
w.unmonitor if w.state != :unmonitored w.action(:stop) if w.alive? end end
def self.stop_all
self.watches.sort.each do |name, w|
Thread.new do
w.unmonitor if w.state != :unmonitored
w.action(:stop) if w.alive?
end
end

terminate_timeout.times do
return true unless self.watches.map { |name, w| w.alive? }.any?
Expand Down

0 comments on commit 6300d5b

Please sign in to comment.