Logged expection in import_email script

Lucas Kanashiro
1 parent dcbb8462
Showing 1 changed file with 8 additions and 2 deletions Show diff stats
src/super_archives/management/commands/import_emails.py
@@ -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,14 @@ 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'))
+        except Exception, e:
+            logging.except(e)
+            raise
+        finally:
+            os.remove(self.lock_file)
  
         os.remove(self.lock_file)
...	...	@@ -7,6 +7,7 @@ import os
7	7	import re
8	8	import sys
9	9	import mailbox
	10	+import logging
10	11	from optparse import make_option
11	12
12	13	from django.db import transaction
...	...	@@ -248,7 +249,6 @@ class Command(BaseCommand, object):
248	249	# This anti-pattern is needed to avoid the transations to
249	250	# get stuck in case of errors.
250	251	transaction.rollback()
251		- os.remove(self.lock_file)
252	252	raise
253	253
254	254	count += 1
...	...	@@ -279,8 +279,14 @@ class Command(BaseCommand, object):
279	279	run_lock = file(self.lock_file, 'w')
280	280	run_lock.close()
281	281
282		- self.import_emails(archives_path,
	282	+ try:
	283	+ self.import_emails(archives_path,
283	284	options.get('all'), options.get('exclude_lists'))
	285	+ except Exception, e:
	286	+ logging.except(e)
	287	+ raise
	288	+ finally:
	289	+ os.remove(self.lock_file)
284	290
285	291	os.remove(self.lock_file)
286	292
...	...