From ba85c7eb576d2723849b54e56cd8b1f261c582da Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 17 Mar 2020 15:26:52 +0100 Subject: [PATCH 3/3] commands: misc improvements in clean-unused-accounts (#26909) --- .../commands/clean-unused-accounts.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/authentic2/management/commands/clean-unused-accounts.py b/src/authentic2/management/commands/clean-unused-accounts.py index b67c33e6..4868c333 100644 --- a/src/authentic2/management/commands/clean-unused-accounts.py +++ b/src/authentic2/management/commands/clean-unused-accounts.py @@ -51,23 +51,20 @@ class Command(BaseCommand): parser.add_argument("--fake", action='store_true', help='do nothing', default=False) def handle(self, *args, **options): - try: - self.clean_unused_acccounts(*args, **options) - except Exception: - logger.exception('failure while cleaning unused accounts') - - def clean_unused_acccounts(self, *args, **options): if options['verbosity'] == '0': - logging.basicConfig(level=logging.CRITICAL) + logger.setLevel(level=logging.CRITICAL) if options['verbosity'] == '1': - logging.basicConfig(level=logging.WARNING) + logger.setLevel(level=logging.WARNING) elif options['verbosity'] == '2': - logging.basicConfig(level=logging.INFO) + logger.setLevel(level=logging.INFO) elif options['verbosity'] == '3': - logging.basicConfig(level=logging.DEBUG) + logger.setLevel(level=logging.DEBUG) + self.fake = options['fake'] + self.clean_unused_accounts() + + def clean_unused_accounts(self): now = timezone.now() - self.fake = options['fake'] if self.fake: logger.info('fake call to clean-unused-accounts') -- 2.20.1