diff options
author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-07-12 17:39:15 +0900 |
---|---|---|
committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2017-07-12 17:39:15 +0900 |
commit | f8138f9dc243961da5b8f8d8de8afd20a6e0d644 (patch) | |
tree | 838b8227c729464cf97aa4f5ee28b0017b71837e | |
parent | 119c004733b788d1338c41bd3808c08be7968625 (diff) | |
download | buildstream-f8138f9dc243961da5b8f8d8de8afd20a6e0d644.tar.gz |
_pipeline.py: Simplified end of session reports.
This was a bit contorted, and is no longer needed with
the new end of session generic reports which show the status
of each scheduler queue.
-rw-r--r-- | buildstream/_pipeline.py | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/buildstream/_pipeline.py b/buildstream/_pipeline.py index 290c9277b..000f21397 100644 --- a/buildstream/_pipeline.py +++ b/buildstream/_pipeline.py @@ -286,19 +286,19 @@ class Pipeline(): self.message(self.target, MessageType.START, "Starting track") elapsed, status = scheduler.run([track]) - changed = len(track.changed_sources) + changed = len(track.processed_elements) if status == SchedStatus.ERROR: self.message(self.target, MessageType.FAIL, "Track failed", elapsed=elapsed) raise PipelineError() elif status == SchedStatus.TERMINATED: self.message(self.target, MessageType.WARN, - "Terminated after tracking {} sources".format(changed), + "Terminated after updating {} source references".format(changed), elapsed=elapsed) raise PipelineError() else: self.message(self.target, MessageType.SUCCESS, - "Tracked {} sources".format(changed), + "Updated {} source references".format(changed), elapsed=elapsed) # fetch() @@ -398,33 +398,16 @@ class Pipeline(): self.message(self.target, MessageType.START, "Starting build") elapsed, status = scheduler.run(queues) - fetched = len(fetch.processed_elements) built = len(build.processed_elements) - if push: - pushed = len(push.processed_elements) - else: - pushed = 0 - if pull: - pulled = len(pull.processed_elements) - else: - pulled = 0 if status == SchedStatus.ERROR: self.message(self.target, MessageType.FAIL, "Build failed", elapsed=elapsed) raise PipelineError() elif status == SchedStatus.TERMINATED: - self.message(self.target, MessageType.WARN, - "Terminated after fetching {} elements, ".format(fetched) + - "pulling {} elements, ".format(pulled) + - "building {} elements ".format(built) + - "and pushing {} elements".format(pushed), - elapsed=elapsed) + self.message(self.target, MessageType.WARN, "Terminated", elapsed=elapsed) raise PipelineError() else: - self.message(self.target, MessageType.SUCCESS, - "Fetched {} elements, pulled {} elements, built {} elements and pushed {} elements" - .format(fetched, pulled, built, pushed), - elapsed=elapsed) + self.message(self.target, MessageType.SUCCESS, "Build Complete", elapsed=elapsed) # checkout() # @@ -460,7 +443,9 @@ class Pipeline(): with self.target.timed_activity("Copying files to {}".format(directory)): utils.copy_files(sandbox_root, directory) - # Internal: + # remove_elements(): + # + # Internal function # # Returns all elements to be removed from the given list of # elements when the given removed elements and their unique |