From a8bc4bf6976cdad828041c5ae4b6ddee5f0d1da4 Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Fri, 30 Sep 2016 21:26:45 +0200 Subject: [PATCH] Send the correct phase when setting the phase from job_complete --- buildman/enums.py | 8 ++++++++ buildman/server.py | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/buildman/enums.py b/buildman/enums.py index 2a5cb1978..f88d2b690 100644 --- a/buildman/enums.py +++ b/buildman/enums.py @@ -1,3 +1,5 @@ +from data.database import BUILD_PHASE + class BuildJobResult(object): """ Build job result enum """ INCOMPLETE = 'incomplete' @@ -11,3 +13,9 @@ class BuildServerStatus(object): RUNNING = 'running' SHUTDOWN = 'shutting_down' EXCEPTION = 'exception' + +RESULT_PHASES = { + BuildJobResult.INCOMPLETE: BUILD_PHASE.INTERNAL_ERROR, + BuildJobResult.COMPLETE: BUILD_PHASE.COMPLETE, + BuildJobResult.ERROR: BUILD_PHASE.ERROR, +} diff --git a/buildman/server.py b/buildman/server.py index f8f6f8f1c..14a577d67 100644 --- a/buildman/server.py +++ b/buildman/server.py @@ -12,7 +12,7 @@ from threading import Event from trollius.coroutines import From from datetime import timedelta -from buildman.enums import BuildJobResult, BuildServerStatus +from buildman.enums import BuildJobResult, BuildServerStatus, RESULT_PHASES from buildman.jobutil.buildstatus import StatusHandler from buildman.jobutil.buildjob import BuildJob, BuildJobLoadException from data import database @@ -149,7 +149,7 @@ class BuilderServer(object): if update_phase: status_handler = StatusHandler(self._build_logs, build_job.repo_build.uuid) - status_handler.set_phase(job_status) + status_handler.set_phase(RESULT_PHASE[job_status]) self._job_count = self._job_count - 1