Clean up error handling for RemoveLog
With the error message change in travis-core, we can handle 2 exceptions in one rescue clause
This commit is contained in:
parent
4a3807b21a
commit
8da49332d6
|
@ -45,7 +45,7 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/travis-ci/travis-core.git
|
||||
revision: a8d8e4c9c92e436645e80c6fb486fff8a442e6f6
|
||||
revision: a4f19caa0ae6847a3a10db2b99ba752a656aad98
|
||||
specs:
|
||||
travis-core (0.0.1)
|
||||
actionmailer (~> 3.2.12)
|
||||
|
|
|
@ -72,10 +72,7 @@ class Travis::Api::App
|
|||
rescue Travis::AuthorizationDenied => e
|
||||
status 401
|
||||
{ error: { message: e.message } }
|
||||
rescue Travis::JobUnfinished => jue
|
||||
status 409
|
||||
{ error: { message: "Job #{id} is not finished" } }
|
||||
rescue Travis::LogAlreadyRemoved => e
|
||||
rescue Travis::JobUnfinished, Travis::LogAlreadyRemoved => e
|
||||
status 409
|
||||
{ error: { message: e.message } }
|
||||
end
|
||||
|
|
|
@ -18,10 +18,7 @@ class Travis::Api::App
|
|||
rescue Travis::AuthorizationDenied => ade
|
||||
status 401
|
||||
{ error: { message: ade.message } }
|
||||
rescue Travis::JobUnfinished => jue
|
||||
status 409
|
||||
{ error: { message: "Job #{id} is not finished" } }
|
||||
rescue Travis::LogAlreadyRemoved => e
|
||||
rescue Travis::JobUnfinished, Travis::LogAlreadyRemoved => e
|
||||
status 409
|
||||
{ error: { message: e.message } }
|
||||
rescue => e
|
||||
|
|
Loading…
Reference in New Issue
Block a user