diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-11 06:33:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-11 06:33:05 +0000 |
| commit | 48c049db793e4b508063d1a85d08c7418761c554 (patch) | |
| tree | 305d452e04a00e3e9ab0287fc053ac2a1bf92d5d /zuul/manager | |
| parent | 03adf24346bd6e65a088e9174e01dea72decda93 (diff) | |
| parent | 69317035363ea035b28b0f3d3cf565d94d02b83f (diff) | |
| download | zuul-48c049db793e4b508063d1a85d08c7418761c554.tar.gz | |
Merge "Annotate logs around finished builds"
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 1e3478245..8a6f82e5c 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 |