vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] email queue must be fifo with priority

Browse source
This commit is contained in:
Rushabh Mehta 2016-08-01 22:04:23 +05:30
parent 6429d7f067
commit 2bf6be0629
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frappe/email/queue.py
View file

@ -254,9 +254,6 @@ def flush(from_test=False):
msgprint(_("Emails are muted"))
from_test = True
frappe.db.sql("""update `tabEmail Queue` set status='Expired'
where datediff(curdate(), creation) > 7 and status='Not Sent'""", auto_commit=auto_commit)
smtpserver = SMTPServer()
make_cache_queue()
@ -281,9 +278,10 @@ def make_cache_queue():
order by priority desc, creation asc
limit 500''', { 'now': now_datetime() })
# reset value
cache.delete_value('cache_email_queue')
for e in emails:
cache.lpush('cache_email_queue', e[0])
cache.rpush('cache_email_queue', e[0])
def send_one(email, smtpserver=None, auto_commit=True, now=False):
'''Send Email Queue with given smtpserver'''
@ -350,3 +348,6 @@ def clear_outbox():
"""Remove mails older than 31 days in Outbox. Called daily via scheduler."""
frappe.db.sql("""delete from `tabEmail Queue` where
datediff(now(), creation) > 31""")
frappe.db.sql("""update `tabEmail Queue` set status='Expired'
where datediff(curdate(), creation) > 7 and status='Not Sent'""")

4
frappe/utils/redis_wrapper.py
View file

@ -120,6 +120,9 @@ class RedisWrapper(redis.Redis):
def lpush(self, key, value):
super(redis.Redis, self).lpush(self.make_key(key), value)
def rpush(self, key, value):
super(redis.Redis, self).rpush(self.make_key(key), value)
def lpop(self, key):
return super(redis.Redis, self).lpop(self.make_key(key))
@ -180,3 +183,4 @@ class RedisWrapper(redis.Redis):
except redis.exceptions.ConnectionError:
return []