From 46256cddd7591a0ce31ca9db1a3530745aa0de3f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 27 Aug 2014 12:23:52 +0530 Subject: [PATCH] Enqueue Newsletter sending in Longjob Queue --- erpnext/support/doctype/newsletter/newsletter.py | 4 +++- erpnext/tasks.py | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/erpnext/support/doctype/newsletter/newsletter.py b/erpnext/support/doctype/newsletter/newsletter.py index 57063bbc6a..15bf0dac99 100644 --- a/erpnext/support/doctype/newsletter/newsletter.py +++ b/erpnext/support/doctype/newsletter/newsletter.py @@ -33,7 +33,9 @@ class Newsletter(Document): 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 da2ab03ccc..d564a35e29 100644 --- a/erpnext/tasks.py +++ b/erpnext/tasks.py @@ -6,7 +6,8 @@ import frappe 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)