diff options
Diffstat (limited to 'src/buildstream/_messenger.py')
| -rw-r--r-- | src/buildstream/_messenger.py | 58 |
1 files changed, 11 insertions, 47 deletions
diff --git a/src/buildstream/_messenger.py b/src/buildstream/_messenger.py index 687d64ebf..bf27f5620 100644 --- a/src/buildstream/_messenger.py +++ b/src/buildstream/_messenger.py @@ -159,18 +159,11 @@ class Messenger: # silent_nested (bool): If True, all but _message.unconditional_messages are silenced # @contextmanager - def timed_activity( - self, activity_name, *, element_name=None, detail=None, silent_nested=False - ): + def timed_activity(self, activity_name, *, element_name=None, detail=None, silent_nested=False): with self._timed_suspendable() as timedata: try: # Push activity depth for status messages - message = Message( - MessageType.START, - activity_name, - detail=detail, - element_name=element_name, - ) + message = Message(MessageType.START, activity_name, detail=detail, element_name=element_name,) self.message(message) with self.silence(actually_silence=silent_nested): yield @@ -179,22 +172,12 @@ class Messenger: # Note the failure in status messages and reraise, the scheduler # expects an error when there is an error. elapsed = datetime.datetime.now() - timedata.start_time - message = Message( - MessageType.FAIL, - activity_name, - elapsed=elapsed, - element_name=element_name, - ) + message = Message(MessageType.FAIL, activity_name, elapsed=elapsed, element_name=element_name,) self.message(message) raise elapsed = datetime.datetime.now() - timedata.start_time - message = Message( - MessageType.SUCCESS, - activity_name, - elapsed=elapsed, - element_name=element_name, - ) + message = Message(MessageType.SUCCESS, activity_name, elapsed=elapsed, element_name=element_name,) self.message(message) # simple_task() @@ -211,14 +194,10 @@ class Messenger: # Task: A Task object that represents this activity, principally used to report progress # @contextmanager - def simple_task( - self, activity_name, *, element_name=None, full_name=None, silent_nested=False - ): + def simple_task(self, activity_name, *, element_name=None, full_name=None, silent_nested=False): # Bypass use of State when none exists (e.g. tests) if not self._state: - with self.timed_activity( - activity_name, element_name=element_name, silent_nested=silent_nested - ): + with self.timed_activity(activity_name, element_name=element_name, silent_nested=silent_nested): yield return @@ -227,9 +206,7 @@ class Messenger: with self._timed_suspendable() as timedata: try: - message = Message( - MessageType.START, activity_name, element_name=element_name - ) + message = Message(MessageType.START, activity_name, element_name=element_name) self.message(message) task = self._state.add_task(activity_name, full_name) @@ -243,12 +220,7 @@ class Messenger: except BstError: elapsed = datetime.datetime.now() - timedata.start_time - message = Message( - MessageType.FAIL, - activity_name, - elapsed=elapsed, - element_name=element_name, - ) + message = Message(MessageType.FAIL, activity_name, elapsed=elapsed, element_name=element_name,) self.message(message) raise finally: @@ -262,17 +234,11 @@ class Messenger: if task.current_progress is not None and elapsed > _DISPLAY_LIMIT: if task.maximum_progress is not None: - detail = "{} of {} subtasks processed".format( - task.current_progress, task.maximum_progress - ) + detail = "{} of {} subtasks processed".format(task.current_progress, task.maximum_progress) else: detail = "{} subtasks processed".format(task.current_progress) message = Message( - MessageType.SUCCESS, - activity_name, - elapsed=elapsed, - detail=detail, - element_name=element_name, + MessageType.SUCCESS, activity_name, elapsed=elapsed, detail=detail, element_name=element_name, ) self.message(message) @@ -308,9 +274,7 @@ class Messenger: # Create the fully qualified logfile in the log directory, # appending the pid and .log extension at the end. - self._log_filename = os.path.join( - logdir, "{}.{}.log".format(filename, os.getpid()) - ) + self._log_filename = os.path.join(logdir, "{}.{}.log".format(filename, os.getpid())) # Ensure the directory exists first directory = os.path.dirname(self._log_filename) |