nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 22:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2112 from anandpdoshi/anand-august-27

Browse Source 
Enqueue Newsletter sending in Longjob Queue
This commit is contained in:
Pratik Vyas
2014-08-27 15:14:26 +05:30
parent 54ca95bc6e 46256cddd7
commit 4cb67339c5
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/support/doctype/newsletter/newsletter.py
View File

@@ -33,7 +33,9 @@ class Newsletter(Document):
if getattr(frappe.local, "is_ajax", False): if getattr(frappe.local, "is_ajax", False):
# to avoid request timed out! # to avoid request timed out!
self.validate_send() self.validate_send()
erpnext.tasks.send_newsletter.delay(frappe.local.site, self.name)
# hack! event="bulk_long" to queue in longjob queue
erpnext.tasks.send_newsletter.delay(frappe.local.site, self.name, event="bulk_long")
else: else:
self.send_bulk() self.send_bulk()

3
erpnext/tasks.py
View File

@@ -6,7 +6,8 @@ import frappe
from frappe.celery_app import celery_task, task_logger from frappe.celery_app import celery_task, task_logger
@celery_task() @celery_task()
def send_newsletter(site, newsletter): def send_newsletter(site, newsletter, event):
# hack! pass event="bulk_long" to queue in longjob queue
try: try:
frappe.connect(site=site) frappe.connect(site=site)
doc = frappe.get_doc("Newsletter", newsletter) doc = frappe.get_doc("Newsletter", newsletter)