From 281818e0b25b08d2fa5015c402abd7a4956afd42 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Thu, 11 Oct 2012 13:40:11 -0500 Subject: Admin.Reports: Fix printStats decorator --- src/lib/Bcfg2/Server/Admin/Reports.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py index a2c3b59b0..c2a04ffd2 100644 --- a/src/lib/Bcfg2/Server/Admin/Reports.py +++ b/src/lib/Bcfg2/Server/Admin/Reports.py @@ -39,22 +39,19 @@ def printStats(fn): Decorator for purging. Prints database statistics after a run. """ def print_stats(self, *data): - start_client = Client.objects.count() - start_i = Interaction.objects.count() - start_ei = Entries_interactions.objects.count() - start_perf = Performance.objects.count() + classes = (Client, Interaction, Performance, \ + FailureEntry, ActionEntry, PathEntry, PackageEntry, \ + ServiceEntry) + + starts = {} + for cls in classes: + starts[cls] = cls.objects.count() fn(self, *data) - self.log.info("Clients removed: %s" % - (start_client - Client.objects.count())) - self.log.info("Interactions removed: %s" % - (start_i - Interaction.objects.count())) - self.log.info("Interactions->Entries removed: %s" % - (start_ei - 0)) - # (start_ei - Entries_interactions.objects.count())) - self.log.info("Metrics removed: %s" % - (start_perf - Performance.objects.count())) + for cls in classes: + print("%s removed: %s" % (cls().__class__.__name__, + cls.objects.count() - starts[cls])) return print_stats -- cgit v1.2.3-1-g7c22