zuul/zuul
Code Issues Proposed changes

model: add annotateLogger procedure

Browse Source 
This change adds a new procedure to the ChangeQueue to limit
direct access to the event variable member.

Change-Id: Ic48b0a6c67c1ac888cf6d48f0164d4b2e260daec
This commit is contained in:
Tristan Cacqueray
2019-06-07 00:18:49 +00:00
parent e0c975a980
commit d5896f0ac2
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zuul/manager/__init__.py
View File

@@ -378,7 +378,7 @@ class PipelineManager(object):
change.commit_needs_changes = dependencies
def provisionNodes(self, item):
log = get_annotated_logger(self.log, item.event)
log = item.annotateLogger(self.log)
jobs = item.findJobsToRequest(item.pipeline.tenant.semaphore_handler)
if not jobs:
return False
@@ -618,7 +618,7 @@ class PipelineManager(object):
return self._loadDynamicLayout(item)
def scheduleMerge(self, item, files=None, dirs=None):
log = get_annotated_logger(self.log, item.event)
log = item.annotateLogger(self.log)
log.debug("Scheduling merge for item %s (files: %s, dirs: %s)" %
(item, files, dirs))
build_set = item.current_build_set
@@ -636,7 +636,7 @@ class PipelineManager(object):
return False
def scheduleFilesChanges(self, item):
log = get_annotated_logger(self.log, item.event)
log = item.annotateLogger(self.log)
log.debug("Scheduling fileschanged for item %s", item)
build_set = item.current_build_set
build_set.files_state = build_set.PENDING
@@ -671,7 +671,7 @@ class PipelineManager(object):
return ready
def prepareJobs(self, item):
log = get_annotated_logger(self.log, item.event)
log = item.annotateLogger(self.log)
# This only runs once the item is in the pipeline's action window
# Returns True if the item is ready, false otherwise
if not item.live:
@@ -697,7 +697,7 @@ class PipelineManager(object):
return True
def _processOneItem(self, item, nnfi):
log = get_annotated_logger(self.log, item.event)
log = item.annotateLogger(self.log)
changed = False
ready = False
dequeued = False