summaryrefslogtreecommitdiff
path: root/src/buildstream/_scheduler/jobs
diff options
context:
space:
mode:
authorTom Pollard <tom.pollard@codethink.co.uk>2019-09-05 17:30:35 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-09-10 10:44:53 +0000
commita97af8edd7e1e9385c45fca2761f7327f9180059 (patch)
treeb6c38c31da12c85d486bf4333f9559ea86f85f7a /src/buildstream/_scheduler/jobs
parentaaa104bc2e95e973adb6b61276e38ed573bd97d2 (diff)
downloadbuildstream-a97af8edd7e1e9385c45fca2761f7327f9180059.tar.gz
scheduler.py: Notification for Message() propagation
Add a notification for MESSAGE. Instead of scheduler's Queues and Jobs directly calling the message handler that App has assigned to Context, the Message() is now sent over the notification handler where it is then given to Messenger's handler.
Diffstat (limited to 'src/buildstream/_scheduler/jobs')
-rw-r--r--src/buildstream/_scheduler/jobs/job.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/buildstream/_scheduler/jobs/job.py b/src/buildstream/_scheduler/jobs/job.py
index 9af08df92..913e27ea2 100644
--- a/src/buildstream/_scheduler/jobs/job.py
+++ b/src/buildstream/_scheduler/jobs/job.py
@@ -393,8 +393,8 @@ class Job():
element_name = self._message_element_name
if element_key is None:
element_key = self._message_element_key
- self._scheduler.context.messenger.message(
- Message(message_type, message, element_name=element_name, element_key=element_key, **kwargs))
+ message = Message(message_type, message, element_name=element_name, element_key=element_key, **kwargs)
+ self._scheduler.notify_messenger(message)
# get_element()
#
@@ -536,7 +536,7 @@ class Job():
if envelope.message_type is _MessageType.LOG_MESSAGE:
# Propagate received messages from children
# back through the context.
- self._scheduler.context.messenger.message(envelope.message)
+ self._scheduler.notify_messenger(envelope.message)
elif envelope.message_type is _MessageType.ERROR:
# For regression tests only, save the last error domain / reason
# reported from a child task in the main process, this global state