shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Remove pasted code from cleanup_deleted, consistently use logger for cleanup commands.

Browse Source
This commit is contained in:
Chris Church 2015-05-14 15:40:14 -04:00
parent 42759cfa5d
commit 74cfca2f21
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/cleanup_activitystream.py
View File

@ -58,7 +58,7 @@ class Command(NoArgsCommand):
if len(pks_to_delete): if len(pks_to_delete):
ActivityStream.objects.filter(pk__in=pks_to_delete).delete() ActivityStream.objects.filter(pk__in=pks_to_delete).delete()
n_deleted_items += len(pks_to_delete) n_deleted_items += len(pks_to_delete)
print("Removed %s items" % str(n_deleted_items)) self.logger.log(99, "Removed %d items", n_deleted_items)
def handle_noargs(self, **options): def handle_noargs(self, **options):
self.verbosity = int(options.get('verbosity', 1)) self.verbosity = int(options.get('verbosity', 1))

27
awx/main/management/commands/cleanup_deleted.py
View File

@ -40,29 +40,6 @@ class Command(BaseCommand):
yield submodel yield submodel
def cleanup_model(self, model): def cleanup_model(self, model):
n_deleted_items = 0
pks_to_delete = set()
for asobj in ActivityStream.objects.iterator():
asobj_disp = '"%s" id: %s' % (unicode(asobj), asobj.id)
if asobj.timestamp >= self.cutoff:
if self.dry_run:
self.logger.info("would skip %s" % asobj_disp)
else:
if self.dry_run:
self.logger.info("would delete %s" % asobj_disp)
else:
pks_to_delete.add(asobj.pk)
# Cleanup objects in batches instead of deleting each one individually.
if len(pks_to_delete) >= 500:
ActivityStream.objects.filter(pk__in=pks_to_delete).delete()
n_deleted_items += len(pks_to_delete)
pks_to_delete.clear()
if len(pks_to_delete):
ActivityStream.objects.filter(pk__in=pks_to_delete).delete()
n_deleted_items += len(pks_to_delete)
print("Removed %s items" % str(n_deleted_items))
name_field = None name_field = None
active_field = None active_field = None
n_deleted_items = 0 n_deleted_items = 0
@ -138,6 +115,6 @@ class Command(BaseCommand):
n_deleted_items += self.cleanup_model(model) n_deleted_items += self.cleanup_model(model)
if not self.dry_run: if not self.dry_run:
print("Removed %s items" % str(n_deleted_items)) self.logger.log(99, "Removed %d items", n_deleted_items)
else: else:
print("Would have removed %s items" % str(n_deleted_items)) self.logger.log(99, "Would have removed %d items", n_deleted_items)