Merge pull request #49 from colab/log_scripts

Logged expection in import_email script

Merge pull request #49 from colab/log_scripts
Logged expection in import_email script
Sergio Oliveira
2 parents dcbb8462 51f49c61
Showing 2 changed files with 18 additions and 9 deletions Show diff stats
src/badger/management/commands/update_badges.py
src/super_archives/management/commands/import_emails.py
@@ -6,11 +6,12 @@ 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 handle(self, *args, **kwargs):
+    def update_badges(self):
         for badge in Badge.objects.filter(type='auto'):
             if not badge.comparison:
                 continue
@@ -30,10 +31,14 @@ class Command(BaseCommand):
             )
             opts = {key: badge.value}
-            sqs = SearchQuerySet().filter(
-                type='user',
-                **opts
-            )
+            sqs = SearchQuerySet().filter(type='user', **opts)
             for user in sqs:
                 badge.awardees.add(User.objects.get(pk=user.pk))
+
+    def handle(self, *args, **kwargs):
+        try:
+            self.update_badges()
+        except Exception as e:
+            logging.exception(e)
+            raise
@@ -7,6 +7,7 @@ import os
 import re
 import sys
 import mailbox
+import logging
 from optparse import make_option
 from django.db import transaction
@@ -248,7 +249,6 @@ class Command(BaseCommand, object):
                 # This anti-pattern is needed to avoid the transations to
                 #   get stuck in case of errors.
                 transaction.rollback()
-                os.remove(self.lock_file)
                 raise
             count += 1
@@ -279,8 +279,12 @@ class Command(BaseCommand, object):
         run_lock = file(self.lock_file, 'w')
         run_lock.close()
-        self.import_emails(archives_path,
+        try:
+            self.import_emails(archives_path,
                            options.get('all'), options.get('exclude_lists'))
-
-        os.remove(self.lock_file)
+        except Exception as e:
+            logging.exception(e)
+            raise
+        finally:
+            os.remove(self.lock_file)