summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Smith <qinusty@gmail.com>2018-09-12 10:23:51 +0100
committerJosh Smith <jrsmith9822@gmail.com>2018-09-12 19:18:42 +0100
commitc3181d3f6895d72860b814c2589e308a7b045703 (patch)
treefa590145256b912ab50fff2192c6bfccb870de8f
parentfd0303e084abb2fd364e45b0aad27dfe6aed0593 (diff)
downloadbuildstream-Qinusty/skipped-rework.tar.gz
cascache.py: Modify messaging API callsQinusty/skipped-rework
Both pulling and pushing INFO messages are now status messages. Calls to the messaging API through `self.context.message()` have now been switched to `element.info`.
-rw-r--r--buildstream/_artifactcache/cascache.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py
index 60495a867..ca91282ce 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -229,7 +229,7 @@ class CASCache(ArtifactCache):
try:
remote.init()
- element.info("Pulling {} <- {}".format(element._get_brief_display_key(), remote.spec.url))
+ element.status("Pulling {} <- {}".format(element._get_brief_display_key(), remote.spec.url))
request = buildstream_pb2.GetReferenceRequest()
request.key = ref
@@ -251,11 +251,8 @@ class CASCache(ArtifactCache):
raise ArtifactError("Failed to pull artifact {}: {}".format(
element._get_brief_display_key(), e)) from e
else:
- self.context.message(Message(
- None,
- MessageType.INFO,
- "Remote ({}) does not have {} cached".format(
- remote.spec.url, element._get_brief_display_key())
+ element.info("Remote ({}) does not have {} cached".format(
+ remote.spec.url, element._get_brief_display_key()
))
return False
@@ -336,17 +333,13 @@ class CASCache(ArtifactCache):
for remote in push_remotes:
remote.init()
-
- element.info("Pushing {} -> {}".format(element._get_brief_display_key(), remote.spec.url))
+ element.status("Pushing {} -> {}".format(element._get_brief_display_key(), remote.spec.url))
if self._push_refs_to_remote(refs, remote):
pushed = True
else:
- self.context.message(Message(
- None,
- MessageType.INFO,
- "Remote ({}) already has {} cached".format(
- remote.spec.url, element._get_brief_display_key())
+ element.info("Remote ({}) already has {} cached".format(
+ remote.spec.url, element._get_brief_display_key()
))
return pushed