diff options
author | Angelos Evripiotis <jevripiotis@bloomberg.net> | 2019-07-04 16:09:12 +0100 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-07-05 09:44:45 +0000 |
commit | c58b97794dbbef9398efb1db37ace086d719d974 (patch) | |
tree | dd2a195b9095927b1bbd9a6d28313799e7857bfb /src/buildstream/_messenger.py | |
parent | dccba324553ccd430adf8788f277dda2ef12363f (diff) | |
download | buildstream-c58b97794dbbef9398efb1db37ace086d719d974.tar.gz |
_messenger: use silence ctx, not *_message_depth
Simplify by not calling _{push,pop}_message_depth outside of the silence
context manager, let that do the work instead.
Diffstat (limited to 'src/buildstream/_messenger.py')
-rw-r--r-- | src/buildstream/_messenger.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/buildstream/_messenger.py b/src/buildstream/_messenger.py index 6965081ad..49eaf3e4c 100644 --- a/src/buildstream/_messenger.py +++ b/src/buildstream/_messenger.py @@ -126,21 +126,19 @@ class Messenger(): # Push activity depth for status messages message = Message(unique_id, MessageType.START, activity_name, detail=detail) self.message(message) - self._push_message_depth(silent_nested) - yield + with self.silence(silent_nested): + yield except BstError: # 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) raise elapsed = datetime.datetime.now() - starttime message = Message(unique_id, MessageType.SUCCESS, activity_name, elapsed=elapsed) - self._pop_message_depth() self.message(message) # recorded_messages() |