From 2fa30048ec4cfb405936575f0254a4c75b5ff02f Mon Sep 17 00:00:00 2001 From: Hyoun Jiil Date: Wed, 24 Apr 2013 16:23:22 +0900 Subject: [PATCH] [Title] remove duplicated job set error code [Type] Enhancement [Module] Toolchain / [Priority] Major [Jira#] [Redmine#] 9167 [Problem] [Cause] [Solution] [TestCase] Change-Id: Ie70f2e4635a9e6d9b44b43ef4951dfe70e43721f --- src/build_server/BuildServerException.rb | 1 + src/build_server/JobManager.rb | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/build_server/BuildServerException.rb b/src/build_server/BuildServerException.rb index 557e083..1daf4a3 100644 --- a/src/build_server/BuildServerException.rb +++ b/src/build_server/BuildServerException.rb @@ -25,6 +25,7 @@ class BuildServerException < Exception "ERR020" => "Sending data failed!", "ERR021" => "No DB exists and create(migrate) DB first!", + "ERR022" => "There already exists same job.", "ERR100" => "Package info file(\"package/pkginfo.manifest\") does not exist!", "ERR101" => "Parsing package info file failed!", diff --git a/src/build_server/JobManager.rb b/src/build_server/JobManager.rb index 83f28bb..cc21616 100644 --- a/src/build_server/JobManager.rb +++ b/src/build_server/JobManager.rb @@ -423,8 +423,13 @@ class JobManager end if j1.is_same_with?(j2) then - j1.log.error("There already exists same job. (#{j2.id})", Log::LV_USER) - j1.status = "ERROR" + begin + raise BuildServerException.new("ERR022"), "(#{j2.id})" + rescue BuildServerException => e + j1.error = e + j1.log.error(e.err_message(""), Log::LV_USER) + j1.status = "ERROR" + end break end end -- 2.34.1