From 92f83c56b18b87bdc08e8f729034a8702dbd7449 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Wed, 23 Apr 2014 16:56:06 +0100 Subject: WorkerConnection: _maybe_handle_helper_result Put our _exec_response_msg into WorkerBuildFinished event, it's essentially the same as _finished_msg, just a different name Get our artifact's cache key from the job --- distbuild/worker_build_scheduler.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'distbuild') diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index 5c07a55d..83873d74 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -472,21 +472,16 @@ class WorkerConnection(distbuild.StateMachine): logging.debug('caching: event.msg: %s' % repr(event.msg)) if event.msg['status'] == httplib.OK: logging.debug('Shared artifact cache population done') + new_event = WorkerBuildFinished( - self._finished_msg, self._artifact.cache_key) + self._exec_response_msg, self._job.artifact.cache_key) self.mainloop.queue_event(WorkerConnection, new_event) - self._finished_msg = None - self._helper_id = None self.mainloop.queue_event(self, _Cached()) else: logging.error( 'Failed to populate artifact cache: %s %s' % (event.msg['status'], event.msg['body'])) new_event = WorkerBuildFailed( - self._finished_msg, self._artifact.cache_key) + self._exec_response_msg, self._job.artifact.cache_key) self.mainloop.queue_event(WorkerConnection, new_event) - self._finished_msg = None - self._helper_id = None - self.mainloop.queue_event(self, _JobFailed()) - - self._artifact = None + self.mainloop.queue_event(self, _BuildFailed()) -- cgit v1.2.1