Logged Exception in update_badges script

Lucas Kanashiro
1 parent 2ce3f49a
Showing 1 changed file with 11 additions and 5 deletions Show diff stats
src/badger/management/commands/update_badges.py
@@ -6,17 +6,26 @@ from haystack.query import SearchQuerySet
 from accounts.models import User
 from badger.models import Badge
  
+import logging
  
 class Command(BaseCommand):
     help = "Update the user's badges"
  
+    def search(self, object_type, **opts={}):
+        try:
+            sqs = SearchQuerySet().filter(type=object_type, **opts)
+        except Exception, e:
+            logging.except(e)
+            raise
+        return sqs
+
     def handle(self, *args, **kwargs):
         for badge in Badge.objects.filter(type='auto'):
             if not badge.comparison:
                 continue
             elif badge.comparison == 'biggest':
                 order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
-                sqs = SearchQuerySet().filter(type='user')
+                sqs = self.search('user')
                 user = sqs.order_by(order)[0]
                 badge.awardees.add(User.objects.get(pk=user.pk))
                 continue
@@ -30,10 +39,7 @@ class Command(BaseCommand):
             )
             opts = {key: badge.value}
  
-            sqs = SearchQuerySet().filter(
-                type='user',
-                **opts
-            )
+            sqs = self.search('user', **opts)
  
             for user in sqs:
                 badge.awardees.add(User.objects.get(pk=user.pk))
...	...	@@ -6,17 +6,26 @@ from haystack.query import SearchQuerySet
6	6	from accounts.models import User
7	7	from badger.models import Badge
8	8
	9	+import logging
9	10
10	11	class Command(BaseCommand):
11	12	help = "Update the user's badges"
12	13
	14	+ def search(self, object_type, **opts={}):
	15	+ try:
	16	+ sqs = SearchQuerySet().filter(type=object_type, **opts)
	17	+ except Exception, e:
	18	+ logging.except(e)
	19	+ raise
	20	+ return sqs
	21	+
13	22	def handle(self, args, *kwargs):
14	23	for badge in Badge.objects.filter(type='auto'):
15	24	if not badge.comparison:
16	25	continue
17	26	elif badge.comparison == 'biggest':
18	27	order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
19		- sqs = SearchQuerySet().filter(type='user')
	28	+ sqs = self.search('user')
20	29	user = sqs.order_by(order)[0]
21	30	badge.awardees.add(User.objects.get(pk=user.pk))
22	31	continue
...	...	@@ -30,10 +39,7 @@ class Command(BaseCommand):
30	39	)
31	40	opts = {key: badge.value}
32	41
33		- sqs = SearchQuerySet().filter(
34		- type='user',
35		- **opts
36		- )
	42	+ sqs = self.search('user', **opts)
37	43
38	44	for user in sqs:
39	45	badge.awardees.add(User.objects.get(pk=user.pk))
...	...