External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

aesthetic editing of system job output

Browse Source
This commit is contained in:
AlanCoding
2017-02-06 14:16:43 -05:00
parent 68d9457de9
commit b2f5b82610
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/management/commands/cleanup_jobs.py
View File

@@ -56,8 +56,8 @@ class Command(NoArgsCommand):
#jobs_qs = jobs_qs.filter(created__lte=self.cutoff) #jobs_qs = jobs_qs.filter(created__lte=self.cutoff)
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for job in Job.objects.all(): for job in Job.objects.all():
job_display = '"%s" (started %s, %d host summaries, %d events)' % \ job_display = '"%s" (%d host summaries, %d events)' % \
(unicode(job), unicode(job.created), (unicode(job),
job.job_host_summaries.count(), job.job_events.count()) job.job_host_summaries.count(), job.job_events.count())
if job.status in ('pending', 'waiting', 'running'): if job.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'
@@ -78,8 +78,8 @@ class Command(NoArgsCommand):
def cleanup_ad_hoc_commands(self): def cleanup_ad_hoc_commands(self):
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for ad_hoc_command in AdHocCommand.objects.all(): for ad_hoc_command in AdHocCommand.objects.all():
ad_hoc_command_display = '"%s" (started %s, %d events)' % \ ad_hoc_command_display = '"%s" (%d events)' % \
(unicode(ad_hoc_command), unicode(ad_hoc_command.created), (unicode(ad_hoc_command),
ad_hoc_command.ad_hoc_command_events.count()) ad_hoc_command.ad_hoc_command_events.count())
if ad_hoc_command.status in ('pending', 'waiting', 'running'): if ad_hoc_command.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'
@@ -100,7 +100,7 @@ class Command(NoArgsCommand):
def cleanup_project_updates(self): def cleanup_project_updates(self):
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for pu in ProjectUpdate.objects.all(): for pu in ProjectUpdate.objects.all():
pu_display = '"%s" (started %s)' % (unicode(pu), unicode(pu.created)) pu_display = '"%s" (type %s)' % (unicode(pu), unicode(pu.launch_type))
if pu.status in ('pending', 'waiting', 'running'): if pu.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'
self.logger.debug('%s %s project update %s', action_text, pu.status, pu_display) self.logger.debug('%s %s project update %s', action_text, pu.status, pu_display)
@@ -124,7 +124,7 @@ class Command(NoArgsCommand):
def cleanup_inventory_updates(self): def cleanup_inventory_updates(self):
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for iu in InventoryUpdate.objects.all(): for iu in InventoryUpdate.objects.all():
iu_display = '"%s" (started %s)' % (unicode(iu), unicode(iu.created)) iu_display = '"%s" (source %s)' % (unicode(iu), unicode(iu.source))
if iu.status in ('pending', 'waiting', 'running'): if iu.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'
self.logger.debug('%s %s inventory update %s', action_text, iu.status, iu_display) self.logger.debug('%s %s inventory update %s', action_text, iu.status, iu_display)
@@ -148,7 +148,7 @@ class Command(NoArgsCommand):
def cleanup_management_jobs(self): def cleanup_management_jobs(self):
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for sj in SystemJob.objects.all(): for sj in SystemJob.objects.all():
sj_display = '"%s" (started %s)' % (unicode(sj), unicode(sj.created)) sj_display = '"%s" (type %s)' % (unicode(sj), unicode(sj.job_type))
if sj.status in ('pending', 'waiting', 'running'): if sj.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'
self.logger.debug('%s %s system_job %s', action_text, sj.status, sj_display) self.logger.debug('%s %s system_job %s', action_text, sj.status, sj_display)
@@ -178,8 +178,8 @@ class Command(NoArgsCommand):
def cleanup_workflow_jobs(self): def cleanup_workflow_jobs(self):
skipped, deleted = 0, 0 skipped, deleted = 0, 0
for workflow_job in WorkflowJob.objects.all(): for workflow_job in WorkflowJob.objects.all():
workflow_job_display = '"{}" (started {}, {} nodes)'.format( workflow_job_display = '"{}" ({} nodes)'.format(
unicode(workflow_job), unicode(workflow_job.created), unicode(workflow_job),
workflow_job.workflow_nodes.count()) workflow_job.workflow_nodes.count())
if workflow_job.status in ('pending', 'waiting', 'running'): if workflow_job.status in ('pending', 'waiting', 'running'):
action_text = 'would skip' if self.dry_run else 'skipping' action_text = 'would skip' if self.dry_run else 'skipping'