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

do no return in em-webfinger, causeing weird splunk errors

Browse source
This commit is contained in:
maxwell 2010-11-30 11:33:19 -08:00
parent fce428826c
commit 4c25724573
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/em-webfinger.rb
View file

@ -72,21 +72,24 @@ class EMWebfinger
begin begin
wf_profile = WebfingerProfile.new(@account, webfinger_profile) wf_profile = WebfingerProfile.new(@account, webfinger_profile)
rescue
return process_callbacks "No person could be constructed from this webfinger profile."
end
http = EventMachine::HttpRequest.new(wf_profile.hcard).get OPTS http = EventMachine::HttpRequest.new(wf_profile.hcard).get OPTS
http.callback{ http.callback{
begin begin
hcard = HCard.build http.response hcard = HCard.build http.response
p = Person.build_from_webfinger(wf_profile, hcard) p = Person.build_from_webfinger(wf_profile, hcard)
process_callbacks(p) process_callbacks(p)
rescue rescue
process_callbacks I18n.t 'webfinger.no_person_constructed' process_callbacks I18n.t 'webfinger.no_person_constructed'
end end
} }
http.errback{process_callbacks I18n.t('webfinger.hcard_fetch_failed', :account => @account) } http.errback{
process_callbacks I18n.t('webfinger.hcard_fetch_failed', :account => @account) }
rescue
process_callbacks "No person could be constructed from this webfinger profile."
end
end end
end end