summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-04-23 16:56:06 +0100
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-04-23 17:32:36 +0100
commit92f83c56b18b87bdc08e8f729034a8702dbd7449 (patch)
tree545801babd24bd6faf9493d6a32b0067b3edcea9
parent00a571bde0a3a6005c4ffa029c5c4239a9c2381c (diff)
downloadmorph-92f83c56b18b87bdc08e8f729034a8702dbd7449.tar.gz
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
-rw-r--r--distbuild/worker_build_scheduler.py13
1 files changed, 4 insertions, 9 deletions
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())