From 7419b88cc07c07654c018f63cf08116397b03d5b Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 3 Feb 2015 12:15:07 -0500 Subject: [PATCH] print a single line summary of the number of deletions --- .../management/commands/cleanup_deleted.py | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/awx/main/management/commands/cleanup_deleted.py b/awx/main/management/commands/cleanup_deleted.py index 093856aac3..d794c0ac64 100644 --- a/awx/main/management/commands/cleanup_deleted.py +++ b/awx/main/management/commands/cleanup_deleted.py @@ -50,10 +50,10 @@ class Command(BaseCommand): active_field = field.name if not name_field: self.logger.warning('skipping model %s, no name field', model) - return + return n_deleted_items if not active_field: self.logger.warning('skipping model %s, no active field', model) - return + return n_deleted_items if name_field == 'username' and active_field == 'is_active': name_prefix = '_d_' else: @@ -80,10 +80,7 @@ class Command(BaseCommand): if not self.dry_run: instance.delete() - if not self.dry_run: - print("Removed %s items" % str(n_deleted_items)) - else: - print("Would have removed %s items" % str(n_deleted_items)) + return n_deleted_items def init_logging(self): log_levels = dict(enumerate([logging.ERROR, logging.INFO, @@ -103,6 +100,13 @@ class Command(BaseCommand): self.dry_run = bool(options.get('dry_run', False)) # FIXME: Handle args to select models. self.cutoff = now() - datetime.timedelta(days=self.days) - self.cleanup_model(User) + + n_deleted_items = 0 + n_deleted_items += self.cleanup_model(User) for model in self.get_models(PrimordialModel): - self.cleanup_model(model) + n_deleted_items += self.cleanup_model(model) + + if not self.dry_run: + print("Removed %s items" % str(n_deleted_items)) + else: + print("Would have removed %s items" % str(n_deleted_items))