suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up error handling for RemoveLog

Browse Source 
With the error message change in travis-core, we can handle
2 exceptions in one rescue clause
This commit is contained in:
Hiro Asari 2014-06-11 13:58:57 -04:00
parent 4a3807b21a
commit 8da49332d6
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile.lock
View File

@ -45,7 +45,7 @@ GIT
GIT GIT
remote: git://github.com/travis-ci/travis-core.git remote: git://github.com/travis-ci/travis-core.git
revision: a8d8e4c9c92e436645e80c6fb486fff8a442e6f6 revision: a4f19caa0ae6847a3a10db2b99ba752a656aad98
specs: specs:
travis-core (0.0.1) travis-core (0.0.1)
actionmailer (~> 3.2.12) actionmailer (~> 3.2.12)

5
lib/travis/api/app/endpoint/jobs.rb
View File

@ -72,10 +72,7 @@ class Travis::Api::App
rescue Travis::AuthorizationDenied => e rescue Travis::AuthorizationDenied => e
status 401 status 401
{ error: { message: e.message } } { error: { message: e.message } }
rescue Travis::JobUnfinished => jue rescue Travis::JobUnfinished, Travis::LogAlreadyRemoved => e
status 409
{ error: { message: "Job #{id} is not finished" } }
rescue Travis::LogAlreadyRemoved => e
status 409 status 409
{ error: { message: e.message } } { error: { message: e.message } }
end end

5
lib/travis/api/app/endpoint/logs.rb
View File

@ -18,10 +18,7 @@ class Travis::Api::App
rescue Travis::AuthorizationDenied => ade rescue Travis::AuthorizationDenied => ade
status 401 status 401
{ error: { message: ade.message } } { error: { message: ade.message } }
rescue Travis::JobUnfinished => jue rescue Travis::JobUnfinished, Travis::LogAlreadyRemoved => e
status 409
{ error: { message: "Job #{id} is not finished" } }
rescue Travis::LogAlreadyRemoved => e
status 409 status 409
{ error: { message: e.message } } { error: { message: e.message } }
rescue => e rescue => e