Use new message handlers in favor of old helpers (77ecda96) · Commits · BuildStream / buildstream

buildstream/_artifactcache/artifactcache.py

+1 −10

Original line number	Diff line number	Diff line
		@@ -498,15 +498,6 @@ class ArtifactCache():
		# Local Private Methods #
		################################################

		# _message()
		#
		# Local message propagator
		#
		def _message(self, message_type, message, **kwargs):
		args = dict(kwargs)
		self.context.message(
		Message(None, message_type, message, **args))

		# _set_remotes():
		#
		# Set the list of remote caches. If project is None, the global list of
		@@ -530,7 +521,7 @@ class ArtifactCache():
		#
		def _initialize_remotes(self):
		def remote_failed(url, error):
		self._message(MessageType.WARN, "Failed to initialize remote {}: {}".format(url, error))
		self.context.warn("Failed to fetch remote refs from {}: {}".format(url, error))

		with self.context.timed_activity("Initializing remote caches", silent_nested=True):
		self.initialize_remotes(on_failure=remote_failed)

buildstream/_context.py

+4 −6

Original line number	Diff line number	Diff line
		@@ -444,8 +444,7 @@ class Context():
		with _signals.suspendable(stop_time, resume_time):
		try:
		# Push activity depth for status messages
		message = Message(unique_id, MessageType.START, activity_name, detail=detail)
		self.message(message)
		self.start(activity_name, detail=detail, plugin=unique_id)
		self._push_message_depth(silent_nested)
		yield

		@@ -453,15 +452,14 @@ class Context():
		# Note the failure in status messages and reraise, the scheduler
		# expects an error when there is an error.
		elapsed = datetime.datetime.now() - starttime
		message = Message(unique_id, MessageType.FAIL, activity_name, elapsed=elapsed)
		self._pop_message_depth()
		self.message(message)
		self.failure(activity_name, detail=detail, elapsed=elapsed, plugin=unique_id)
		raise

		elapsed = datetime.datetime.now() - starttime
		message = Message(unique_id, MessageType.SUCCESS, activity_name, elapsed=elapsed)
		self._pop_message_depth()
		self.message(message)
		self.success(activity_name, detail=detail,
		elapsed=elapsed, plugin=unique_id)

		# recorded_messages()
		#

buildstream/_frontend/app.py

+4 −14

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ class App():

		# Mark the beginning of the session
		if session_name:
		self._message(MessageType.START, session_name)
		self.context.start(session_name)

		# Run the body of the session here, once everything is loaded
		try:
		@@ -267,9 +267,9 @@ class App():
		elapsed = self.stream.elapsed_time

		if isinstance(e, StreamError) and e.terminated: # pylint: disable=no-member
		self._message(MessageType.WARN, session_name + ' Terminated', elapsed=elapsed)
		self.context.warn(session_name + ' Terminated', elapsed=elapsed)
		else:
		self._message(MessageType.FAIL, session_name, elapsed=elapsed)
		self.context.failure(session_name, elapsed=elapsed)

		# Notify session failure
		self._notify("{} failed".format(session_name), "{}".format(e))
		@@ -287,7 +287,7 @@ class App():
		else:
		# No exceptions occurred, print session time and summary
		if session_name:
		self._message(MessageType.SUCCESS, session_name, elapsed=self.stream.elapsed_time)
		self.context.success(session_name, elapsed=self.stream.elapsed_time)
		if self._started:
		self._print_summary()

		@@ -433,22 +433,12 @@ class App():
		if self.interactive:
		self.notify(title, text)

		# Local message propagator
		#
		def _message(self, message_type, message, **kwargs):
		args = dict(kwargs)
		self.context.message(
		Message(None, message_type, message, **args))

		# Exception handler
		#
		def _global_exception_handler(self, etype, value, tb):

		# Print the regular BUG message
		formatted = "".join(traceback.format_exception(etype, value, tb))
		self._message(MessageType.BUG, str(value),
		detail=formatted)

		# If the scheduler has started, try to terminate all jobs gracefully,
		# otherwise exit immediately.
		if self.stream.running:

buildstream/_pipeline.py

+2 −11

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ class Pipeline():
		for t in targets:
		new_elm = t._get_source_element()
		if new_elm != t and not silent:
		self._message(MessageType.INFO, "Element '{}' redirected to '{}'"
		self._context.info("Element '{}' redirected to '{}'"
		.format(t.name, new_elm.name))
		if new_elm not in elements:
		elements.append(new_elm)
		@@ -433,15 +433,6 @@ class Pipeline():

		raise PipelineError("Untrackable sources", detail=detail, reason="untrackable-sources")

		# _message()
		#
		# Local message propagator
		#
		def _message(self, message_type, message, **kwargs):
		args = dict(kwargs)
		self._context.message(
		Message(None, message_type, message, **args))


		# _Planner()
		#

buildstream/_platform/linux.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -75,9 +75,9 @@ class Linux(Platform):
		return True

		else:
		context.message(
		Message(None, MessageType.WARN,
		context.warn(
		"Unable to create user namespaces with bubblewrap, resorting to fallback",
		detail="Some builds may not function due to lack of uid / gid 0, " +
		"artifacts created will not be trusted for push purposes."))
		"artifacts created will not be trusted for push purposes."
		)
		return False