zuul
/
zuul
Code Issues Proposed changes

Merge "Drop formatStatusHTML() methods"

This commit is contained in:
Jenkins 2014-05-22 20:53:24 +00:00 committed by Gerrit Code Review
parent e655e27ba3 9a00e99c13
commit 08808e04f0
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zuul/model.py
View File

@ -245,17 +245,6 @@ class Pipeline(object):
items.extend(shared_queue.queue)
return items
def formatStatusHTML(self):
ret = ''
for queue in self.queues:
if len(self.queues) > 1:
s = 'Change queue: %s' % queue.name
ret += s + '\n'
ret += '-' * len(s) + '\n'
for item in queue.queue:
ret += self.formatStatus(item, html=True)
return ret
def formatStatusJSON(self):
j_pipeline = dict(name=self.name,
description=self.description)

23
zuul/scheduler.py
View File

@ -851,29 +851,6 @@ class Scheduler(threading.Thread):
return
pipeline.manager.onMergeCompleted(event)
def formatStatusHTML(self):
ret = '<html><pre>'
if self._pause:
ret += '<p><b>Queue only mode:</b> preparing to '
if self._exit:
ret += 'exit'
ret += ', queue length: %s' % self.trigger_event_queue.qsize()
ret += '</p>'
if self.last_reconfigured:
ret += '<p>Last reconfigured: %s</p>' % self.last_reconfigured
keys = self.layout.pipelines.keys()
for key in keys:
pipeline = self.layout.pipelines[key]
s = 'Pipeline: %s' % pipeline.name
ret += s + '\n'
ret += '-' * len(s) + '\n'
ret += pipeline.formatStatusHTML()
ret += '\n'
ret += '</pre></html>'
return ret
def formatStatusJSON(self):
data = {}