Added USE_ASYNC_FOR_EMAIL to settings

Author: areyohrahul

junction/proposals/comments_views.py

@@ -41,7 +41,11 @@ def create_proposal_comment(request, conference_slug, proposal_slug):
         )
         host = '{}://{}'.format(settings.SITE_PROTOCOL,
                                 request.META.get('HTTP_HOST'))
-        send_mail_for_new_comment.delay(proposal_comment.id, host)
+
+        if settings.USE_ASYNC_FOR_EMAIL:
+            send_mail_for_new_comment.delay(proposal_comment.id, host)
+        else:
+            send_mail_for_new_comment(proposal_comment.id, host)
 
     redirect_url = reverse('proposal-detail',
                            args=[conference.slug, proposal.slug])

junction/proposals/views.py

@@ -131,7 +131,11 @@ def create_proposal(request, conference_slug):
         proposal_type_id=form.cleaned_data['proposal_type'],
         proposal_section_id=form.cleaned_data['proposal_section'])
     host = '{}://{}'.format(settings.SITE_PROTOCOL, request.META.get('HTTP_HOST'))
-    send_mail_for_new_proposal.delay(proposal.id, host)
+
+    if settings.USE_ASYNC_FOR_EMAIL:
+        send_mail_for_new_proposal.delay(proposal.id, host)
+    else:
+        send_mail_for_new_proposal(proposal.id, host)
 
     return HttpResponseRedirect(reverse('proposal-detail',
                                         args=[conference.slug, proposal.slug]))
@@ -387,9 +391,16 @@ def proposal_upload_content(request, conference_slug, slug):
         raise PermissionDenied
 
     host = '{}://{}'.format(settings.SITE_PROTOCOL, request.META['HTTP_HOST'])
-    send_mail_for_proposal_content.delay(conference.id, proposal.id, host)
 
-    message = 'Email sent successfully.'
+    if settings.USE_ASYNC_FOR_EMAIL:
+        send_mail_for_proposal_content.delay(conference.id, proposal.id, host)
+        message = 'Email sent successfully.'
+    else:
+        response = send_mail_for_proposal_content(conference.id, proposal.id, host)
+        if response == 1:
+            message = 'Email sent successfully.'
+        else:
+            message = 'There is problem in sending mail. Please contact conference chair.'
 
     return HttpResponse(message)
 

settings/common.py

@@ -247,3 +247,5 @@
 EXPLARA_API_TOKEN = "shjbalkfbdskjlbdskljbdskaljfb"
 
 QR_CODES_DIR = ROOT_DIR + '/qr_files'
+
+USE_ASYNC_FOR_EMAIL = False

settings/dev.py

@@ -26,5 +26,5 @@
 INSTALLED_APPS += ('django_extensions',)
 
 # settings for celery
-BROKER_URL = os.environ.get("BROKER_URL", "redis://127.0.0.1:6379/0")
-CELERY_RESULT_BACKEND = os.environ.get("CELERY_RESULT_BACKEND", 'redis://127.0.0.1:6379/0')
+BROKER_URL = os.environ.get("BROKER_URL", "redis://redis:6379/0")
+CELERY_RESULT_BACKEND = os.environ.get("CELERY_RESULT_BACKEND", 'redis://redis:6379/0')

settings/dev.py.sample

@@ -15,7 +15,7 @@ DATABASES = {
     }
 }
 
-ACCOUNT_DEFAULT_HTTP_PROTOCOL='http'
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'http'
 
 TEMPLATE_CONTEXT_PROCESSORS += (
     "django.core.context_processors.debug",
@@ -25,6 +25,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 INSTALLED_APPS += ('django_extensions',)
 
-#settings for celery
-BROKER_URL = os.environ.get("BROKER_URL", "redis://redis:6379/0")
-CELERY_RESULT_BACKEND = os.environ.get("CELERY_RESULT_BACKEND", 'redis://redis:6379/0')
+# settings for celery
+BROKER_URL = os.environ.get("BROKER_URL", "redis://127.0.0.1:6379/0")
+CELERY_RESULT_BACKEND = os.environ.get("CELERY_RESULT_BACKEND", 'redis://127.0.0.1:6379/0')