diff options
author | bst-marge-bot <marge-bot@buildstream.build> | 2020-07-06 19:47:33 +0000 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-07-06 19:47:33 +0000 |
commit | 99d827faad1d38e85532e056561a967636cfc4b5 (patch) | |
tree | 55ba99140008a72e9d762b8319613bbbabe586b6 /src/buildstream/_scheduler/jobs/job.py | |
parent | e79f4a019d1d4c23d442f61144e6ac5177eb36b2 (diff) | |
parent | cb2acc31743d6e208a7977288485578ca17effdd (diff) | |
download | buildstream-99d827faad1d38e85532e056561a967636cfc4b5.tar.gz |
Merge branch 'bschubert/simplify-stream-interactions' into 'master'
simplify stream interactions (Remove Notifications)
See merge request BuildStream/buildstream!1985
Diffstat (limited to 'src/buildstream/_scheduler/jobs/job.py')
-rw-r--r-- | src/buildstream/_scheduler/jobs/job.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/buildstream/_scheduler/jobs/job.py b/src/buildstream/_scheduler/jobs/job.py index 78a375fec..7ea87dc62 100644 --- a/src/buildstream/_scheduler/jobs/job.py +++ b/src/buildstream/_scheduler/jobs/job.py @@ -128,6 +128,7 @@ class Job: # Private members # self._scheduler = scheduler # The scheduler + self._messenger = self._scheduler.context.messenger self._pipe_r = None # The read end of a pipe for message passing self._process = None # The Process object self._listening = False # Whether the parent is currently listening @@ -163,7 +164,7 @@ class Job: child_job = self.create_child_job( # pylint: disable=assignment-from-no-return self.action_name, - self._scheduler.context.messenger, + self._messenger, self._scheduler.context.logdir, self._logfile, self._max_retries, @@ -314,7 +315,7 @@ class Job: if element_key is None: element_key = self._message_element_key message = Message(message_type, message, element_name=element_name, element_key=element_key, **kwargs) - self._scheduler.notify_messenger(message) + self._messenger.message(message) # get_element() # @@ -470,7 +471,7 @@ class Job: if envelope.message_type is _MessageType.LOG_MESSAGE: # Propagate received messages from children # back through the context. - self._scheduler.notify_messenger(envelope.message) + self._messenger.message(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 |