nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Chubbies is now a little TOO good at shutting itself off. Also: processes are hard. >.<

Browse source
This commit is contained in:
Sarah Mei 2011-08-06 19:22:09 -07:00
parent 1ccfaedd08
commit 6c512cbfa9
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
features/step_definitions/oauth_steps.rb
View file

@ -3,7 +3,7 @@ Given /^Chubbies is running$/ do
end end
Given /^Chubbies has been killed$/ do Given /^Chubbies has been killed$/ do
Chubbies.ensure_killed Chubbies.kill
end end
Given /^Chubbies is registered on my pod$/ do Given /^Chubbies is registered on my pod$/ do
@ -80,10 +80,6 @@ class Chubbies
`kill -9 #{pid}` if pid.present? `kill -9 #{pid}` if pid.present?
end end
def self.ensure_killed
self.kill if self.running?
end
def self.running? def self.running?
begin begin
begin begin
@ -91,7 +87,7 @@ class Chubbies
rescue RestClient::ResourceNotFound rescue RestClient::ResourceNotFound
end end
true true
rescue Errno::ECONNREFUSED rescue Errno::ECONNREFUSED, Errno::ECONNRESET
false false
end end
end end