From 74cfca2f212808368f9e63bff1b963941dffc51b Mon Sep 17 00:00:00 2001 From: Chris Church Date: Thu, 14 May 2015 15:40:14 -0400 Subject: [PATCH] Remove pasted code from cleanup_deleted, consistently use logger for cleanup commands. --- .../commands/cleanup_activitystream.py | 2 +- .../management/commands/cleanup_deleted.py | 27 ++----------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/awx/main/management/commands/cleanup_activitystream.py b/awx/main/management/commands/cleanup_activitystream.py index 52d359e52d..caf7ac51b6 100644 --- a/awx/main/management/commands/cleanup_activitystream.py +++ b/awx/main/management/commands/cleanup_activitystream.py @@ -58,7 +58,7 @@ class Command(NoArgsCommand): 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)) + self.logger.log(99, "Removed %d items", n_deleted_items) def handle_noargs(self, **options): self.verbosity = int(options.get('verbosity', 1)) diff --git a/awx/main/management/commands/cleanup_deleted.py b/awx/main/management/commands/cleanup_deleted.py index 4c84a695cd..6e3aebcf23 100644 --- a/awx/main/management/commands/cleanup_deleted.py +++ b/awx/main/management/commands/cleanup_deleted.py @@ -40,29 +40,6 @@ class Command(BaseCommand): yield submodel 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 active_field = None n_deleted_items = 0 @@ -138,6 +115,6 @@ class Command(BaseCommand): n_deleted_items += self.cleanup_model(model) if not self.dry_run: - print("Removed %s items" % str(n_deleted_items)) + self.logger.log(99, "Removed %d items", n_deleted_items) else: - print("Would have removed %s items" % str(n_deleted_items)) + self.logger.log(99, "Would have removed %d items", n_deleted_items)