Merge pull request SmileyChris#14 from alepane21/master

- added a cron mode to the management commands

Author: paltman

mailer/engine.py

@@ -32,18 +32,17 @@ def prioritize():
     """
 
     while True:
-        while Message.objects.high_priority().count() or Message.objects.medium_priority().count():
-            while Message.objects.high_priority().count():
-                for message in Message.objects.high_priority().order_by("when_added"):
+        while Message.objects.high_priority().using('default').count() or Message.objects.medium_priority().using('default').count():
+            while Message.objects.high_priority().using('default').count():
+                for message in Message.objects.high_priority().using('default').order_by("when_added"):
                     yield message
-            while Message.objects.high_priority().count() == 0 and Message.objects.medium_priority().count():
-                yield Message.objects.medium_priority().order_by("when_added")[0]
-        while Message.objects.high_priority().count() == 0 and Message.objects.medium_priority().count() == 0 and Message.objects.low_priority().count():
-            yield Message.objects.low_priority().order_by("when_added")[0]
-        if Message.objects.non_deferred().count() == 0:
+            while Message.objects.high_priority().using('default').count() == 0 and Message.objects.medium_priority().using('default').count():
+                yield Message.objects.medium_priority().using('default').order_by("when_added")[0]
+        while Message.objects.high_priority().using('default').count() == 0 and Message.objects.medium_priority().using('default').count() == 0 and Message.objects.low_priority().using('default').count():
+            yield Message.objects.low_priority().using('default').order_by("when_added")[0]
+        if Message.objects.non_deferred().using('default').count() == 0:
             break
 
-
 def send_all():
     """
     Send all eligible messages in the queue.

mailer/management/commands/retry_deferred.py

@@ -1,4 +1,5 @@
 import logging
+from optparse import make_option
 
 from django.core.management.base import NoArgsCommand
 from django.db import connection
@@ -8,9 +9,18 @@
 
 class Command(NoArgsCommand):
     help = "Attempt to resend any deferred mail."
+    base_options = (
+        make_option('-c', '--cron', default=0, type='int',
+            help='If 1 don\'t print messagges, but only errors.'
+        ),
+    )
+    option_list = NoArgsCommand.option_list + base_options
 
     def handle_noargs(self, **options):
-        logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+        if options['cron'] == 0:
+            logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+        else:
+            logging.basicConfig(level=logging.ERROR, format="%(message)s")
         count = Message.objects.retry_deferred() # @@@ new_priority not yet supported
         logging.info("%s message(s) retried" % count)
         connection.close()

mailer/management/commands/send_mail.py

@@ -1,4 +1,5 @@
 import logging
+from optparse import make_option
 
 from django.conf import settings
 from django.core.management.base import NoArgsCommand
@@ -13,9 +14,18 @@
 
 class Command(NoArgsCommand):
     help = "Do one pass through the mail queue, attempting to send all mail."
+    base_options = (
+        make_option('-c', '--cron', default=0, type='int',
+            help='If 1 don\'t print messagges, but only errors.'
+        ),
+    )
+    option_list = NoArgsCommand.option_list + base_options
 
     def handle_noargs(self, **options):
-        logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+        if options['cron'] == 0:
+            logging.basicConfig(level=logging.DEBUG, format="%(message)s")
+        else:
+            logging.basicConfig(level=logging.ERROR, format="%(message)s")
         logging.info("-" * 72)
         # if PAUSE_SEND is turned on don't do anything.
         if not PAUSE_SEND: