Merge pull request #2112 from anandpdoshi/anand-august-27
Enqueue Newsletter sending in Longjob Queue
diff --git a/erpnext/support/doctype/newsletter/newsletter.py b/erpnext/support/doctype/newsletter/newsletter.py
index 57063bb..15bf0da 100644
--- a/erpnext/support/doctype/newsletter/newsletter.py
+++ b/erpnext/support/doctype/newsletter/newsletter.py
@@ -33,7 +33,9 @@
if getattr(frappe.local, "is_ajax", False):
# to avoid request timed out!
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:
self.send_bulk()
diff --git a/erpnext/tasks.py b/erpnext/tasks.py
index da2ab03..d564a35 100644
--- a/erpnext/tasks.py
+++ b/erpnext/tasks.py
@@ -6,7 +6,8 @@
from frappe.celery_app import celery_task, task_logger
@celery_task()
-def send_newsletter(site, newsletter):
+def send_newsletter(site, newsletter, event):
+ # hack! pass event="bulk_long" to queue in longjob queue
try:
frappe.connect(site=site)
doc = frappe.get_doc("Newsletter", newsletter)