removed logger from AWXCollector

awx/main/management/commands/cleanup_jobs.py

@@ -66,34 +66,11 @@ def cleanup_jobs(self):
 
         num_to_delete = Job.objects.filter(created__lt=self.cutoff).count()
 
-        batch_size = 10000
-
-        self.logger.info("deleting total of %d jobs", num_to_delete)
-        while True:
-            pk_list = Job.objects.filter(created__lt=self.cutoff)[0:batch_size].values_list('pk')
-            qs_batch = Job.objects.filter(pk__in=pk_list)
-            if not self.dry_run:
-                just_deleted, _ = qs_batch.delete()
-            else:
-                just_deleted = qs_batch.count()
-            num_deleted += just_deleted
-            self.logger.info('deleted %d jobs', num_deleted)
-            if just_deleted == 0:
-                break
-
-        skipped += Job.objects.filter(created__gte=self.cutoff).count()
-        return skipped, num_deleted
-
-    def cleanup_jobs_fast(self):
-        skipped, num_deleted = 0, 0
-
-        num_to_delete = Job.objects.filter(created__lt=self.cutoff).count()
-
         batch_size = 1000000
 
         self.logger.info("deleting total of %d jobs", num_to_delete)
         while True:
-            collector = AWXCollector('default', self.logger)
+            collector = AWXCollector('default')
             pk_list = Job.objects.filter(created__lt=self.cutoff)[0:batch_size].values_list('pk')
             qs_batch = Job.objects.filter(pk__in=pk_list)
             if not self.dry_run:

awx/main/management/commands/deletion.py

@@ -18,9 +18,9 @@ def bulk_related_objects(field, objs, using):
 
 
 class AWXCollector(Collector):
-    def __init__(self, using, logger=None):
+    def __init__(self, using):
         super().__init__(using)
-        self.logger = logger
+
 
     def add(self, objs, source=None, nullable=False, reverse_dependency=False):
         """
@@ -77,10 +77,8 @@ def collect(self, objs, source=None, nullable=False, collect_related=True,
 
         If 'keep_parents' is True, data of parent model's will be not deleted.
         """
-        if self.logger:
-            self.logger.info("Collecting objects for %s", objs.model._meta.label)
 
-        if not getattr(objs, 'polymorphic_disabled', None):
+        if hasattr(objs, 'polymorphic_disabled'):
             objs.polymorphic_disabled = True
 
         if self.can_fast_delete(objs):
@@ -124,8 +122,7 @@ def collect(self, objs, source=None, nullable=False, collect_related=True,
                     self.collect(sub_objs, source=model, nullable=True)
 
     def delete(self):
-        if self.logger:
-            self.logger.info("Sorting objects to delete")
+
         self.sort()
         # number of objects deleted for each model label
 
@@ -143,8 +140,6 @@ def delete(self):
 
             # update fields
             for model, instances_for_fieldvalues in self.field_updates.items():
-                if self.logger:
-                    self.logger.info("Updating fields for %s", model._meta.label)
                 for (field, value), instances in instances_for_fieldvalues.items():
                     for inst in instances:
                         query = sql.UpdateQuery(model)
@@ -157,8 +152,6 @@ def delete(self):
 
             # delete instances
             for model, pk_list in del_dict.items():
-                if self.logger:
-                    self.logger.info("Deleting objects for %s", model._meta.label)
                 query = sql.DeleteQuery(model)
                 count = query.delete_batch(pk_list, self.using)
                 deleted_counter[model._meta.label] += count