diff options
author | Tobias Henkel <tobias.henkel@bmw.de> | 2019-05-26 19:38:43 +0200 |
---|---|---|
committer | Tobias Henkel <tobias.henkel@bmw.de> | 2019-05-30 19:21:31 +0200 |
commit | 69317035363ea035b28b0f3d3cf565d94d02b83f (patch) | |
tree | 9f85d3c4051099c0295813894e1e5a674d57780e /zuul/manager | |
parent | 1078d767ac5f418056228e9b4a261a9b77a0ac3d (diff) | |
download | zuul-69317035363ea035b28b0f3d3cf565d94d02b83f.tar.gz |
Annotate logs around finished builds
We should annotate the logs around finished builds with event ids.
Change-Id: I44ba4219f6d602aeab1f0d5829dfcb107341cf6d
Diffstat (limited to 'zuul/manager')
-rw-r--r-- | zuul/manager/__init__.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py index 6738174d8..f6834004b 100644 --- a/zuul/manager/__init__.py +++ b/zuul/manager/__init__.py @@ -338,14 +338,16 @@ class PipelineManager(object): return True def dequeueItem(self, item): - self.log.debug("Removing change %s from queue" % item.change) + log = get_annotated_logger(self.log, item.event) + log.debug("Removing change %s from queue", item.change) item.queue.dequeueItem(item) def removeItem(self, item): + log = get_annotated_logger(self.log, item.event) # Remove an item from the queue, probably because it has been # superseded by another change. - self.log.debug("Canceling builds behind change: %s " - "because it is being removed." % item.change) + log.debug("Canceling builds behind change: %s " + "because it is being removed.", item.change) self.cancelJobs(item) self.dequeueItem(item) self.reportStats(item) @@ -436,7 +438,8 @@ class PipelineManager(object): self._executeJobs(item, jobs) def cancelJobs(self, item, prime=True): - self.log.debug("Cancel jobs for change %s" % item.change) + log = get_annotated_logger(self.log, item.event) + log.debug("Cancel jobs for change %s", item.change) canceled = False old_build_set = item.current_build_set jobs_to_cancel = item.getJobs() @@ -448,8 +451,8 @@ class PipelineManager(object): self.sched.cancelJob(old_build_set, job) for item_behind in item.items_behind: - self.log.debug("Canceling jobs for change %s, behind change %s" % - (item_behind.change, item.change)) + log.debug("Canceling jobs for change %s, behind change %s", + item_behind.change, item.change) if self.cancelJobs(item_behind, prime=prime): canceled = True return canceled |