From c433d4b36cf4333476ca04d1a4d9bb277b7dfb41 Mon Sep 17 00:00:00 2001 From: Andrew Colin Kissa Date: Fri, 19 Oct 2012 09:16:01 +0200 Subject: [PATCH] * FIX: #52 Signed-off-by: Andrew Colin Kissa --- .../status/management/commands/queuestats.py | 36 ++++++++++++++------ 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/baruwa/status/management/commands/queuestats.py b/src/baruwa/status/management/commands/queuestats.py index 98e59da..6dd0129 100644 --- a/src/baruwa/status/management/commands/queuestats.py +++ b/src/baruwa/status/management/commands/queuestats.py @@ -20,13 +20,15 @@ # "Queue stats generator" +import subprocess + from optparse import make_option from django.core.management.base import BaseCommand, CommandError from django.utils.translation import ugettext as _ from baruwa.utils.mail.mailq import Mailq -from baruwa.status.models import MailQueueItem +from baruwa.mail.status.models import MailQueueItem from baruwa.utils.misc import get_config_option @@ -80,30 +82,42 @@ class Command(BaseCommand): inqueue = Mailq(mta, inqdir) print _("== Delete flaged queue items from the inbound queue ==") - ditems = MailQueueItem.objects.values('messageid').filter( - flag__gt=0, direction=1).all() + ditems = MailQueueItem.objects\ + .values('messageid')\ + .filter(flag__gt=0, direction=1).all() inrm = inqueue.delete([item['messageid'] for item in ditems]) - MailQueueItem.objects.filter(messageid__in=[ - item['msgid'] for item in inrm]).delete() + MailQueueItem.objects.filter( + messageid__in=[item['msgid'] for item in inrm]).delete() print _("== Deleted %(num)d items from the inbound queue ==") % { - 'num': len(inrm)} + 'num': len(inrm)} inqueue.process() outqueue = Mailq(mta, outqdir) print _("== Delete flaged queue items from the outbound queue ==") - ditems = MailQueueItem.objects.values('messageid').filter( - flag__gt=0, direction=2).all() + ditems = MailQueueItem.objects\ + .values('messageid')\ + .filter(flag__gt=0, direction=2)\ + .all() outrm = outqueue.delete([item['messageid'] for item in ditems]) - MailQueueItem.objects.filter(messageid__in=[ - item['msgid'] for item in outrm]).delete() + MailQueueItem.objects.filter( + messageid__in=[item['msgid'] for item in outrm]).delete() print _("== Deleted %(num)d items from the outbound queue ==") % { 'num': len(outrm)} outqueue.process() allids = [item['messageid'] for item in inqueue] allids.extend([item['messageid'] for item in outqueue]) + pipe1 = subprocess.Popen('hostname', + shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + hostname = pipe1.stdout.read().strip() dbids = [item['messageid'] - for item in MailQueueItem.objects.values('messageid').all()] + for item in MailQueueItem\ + .objects.values('messageid')\ + .filter(hostname=hostname)\ + .all() + ] remids = [item for item in dbids if not item in allids] preids = [item for item in dbids if not item in remids] -- 1.7.5.4