From 8da49332d64282b16f33e55b3c8cae2bdb52747d Mon Sep 17 00:00:00 2001 From: Hiro Asari Date: Wed, 11 Jun 2014 13:58:57 -0400 Subject: [PATCH] Clean up error handling for RemoveLog With the error message change in travis-core, we can handle 2 exceptions in one rescue clause --- Gemfile.lock | 2 +- lib/travis/api/app/endpoint/jobs.rb | 5 +---- lib/travis/api/app/endpoint/logs.rb | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f1de4e5c..459d041a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb index 2424e221..e7af7d32 100644 --- a/lib/travis/api/app/endpoint/jobs.rb +++ b/lib/travis/api/app/endpoint/jobs.rb @@ -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 diff --git a/lib/travis/api/app/endpoint/logs.rb b/lib/travis/api/app/endpoint/logs.rb index 04b3753a..2db13baf 100644 --- a/lib/travis/api/app/endpoint/logs.rb +++ b/lib/travis/api/app/endpoint/logs.rb @@ -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