zuul
/
zuul
Code Issues Proposed changes

Fix some logging issues. 

Use __repr__ for more objects so they look better in log messages.
Fix a problem with erroneous information on the "depends on" log
message.  Fixes bug #1011908.

Change-Id: I43adc5fd0943d99dae28276b7a72009ce9f9a91c
This commit is contained in:
James E. Blair 2012-06-12 17:51:08 -07:00
parent 302ab057ab
commit 9f9667eddf
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox.ini
View File

@ -6,7 +6,7 @@ downloadcache = ~/cache/pip
[testenv:pep8]
deps = pep8
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc .
commands = pep8 --repeat --show-source --exclude=.venv,.tox,dist,doc,build .
[testenv:cover]
setenv = NOSE_WITH_COVERAGE=1

8
zuul/model.py
View File

@ -24,7 +24,7 @@ class ChangeQueue(object):
self._jobs = set()
self.queue = []
def __str__(self):
def __repr__(self):
return '<ChangeQueue %s: %s>' % (self.queue_name, self.name)
def getJobs(self):
@ -182,7 +182,7 @@ class Change(object):
return '%s,%s' % (self.number, self.patchset)
return self.newrev
def __str__(self):
def __repr__(self):
return '<Change 0x%x %s>' % (id(self), self._id())
def formatStatus(self, indent=0):
@ -289,7 +289,7 @@ class TriggerEvent(object):
self.oldrev = None
self.newrew = None
def __str__(self):
def __repr__(self):
ret = '<TriggerEvent %s %s' % (self.type, self.project_name)
if self.branch:
@ -314,7 +314,7 @@ class EventFilter(object):
self.refs = [re.compile(x) for x in refs]
self.approvals = approvals
def __str__(self):
def __repr__(self):
ret = '<EventFilter'
if self._types:

4
zuul/scheduler.py
View File

@ -417,11 +417,13 @@ class DependentQueueManager(BaseQueueManager):
super(DependentQueueManager, self).addChange(change)
def _getDependentChanges(self, change):
orig_change = change
changes = []
while change.change_ahead:
changes.append(change.change_ahead)
change = change.change_ahead
self.log.info("Change %s depends on changes %s" % (change, changes))
self.log.info("Change %s depends on changes %s" % (orig_change,
changes))
return changes
def launchJobs(self, change):