Skip to content

Commit

Permalink
Merge pull request #70 from unicef/remove-djcelery-email
Browse files Browse the repository at this point in the history
Tweak django-celery-email settings
  • Loading branch information
domdinicola authored Jan 8, 2021
2 parents a3a8841 + 25c7774 commit 60b84e1
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/etools_datamart/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@
'%m/%d/%y %H:%M', # '10/25/06 14:30'
'%m/%d/%y', # '10/25/06'
]
EMAIL_BACKEND = 'post_office.EmailBackend'
EMAIL_POST_OFFICE_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_BACKEND = 'post_office.backends.EmailBackend'
EMAIL_HOST_USER = env('EMAIL_HOST_USER')
EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
EMAIL_HOST = env('EMAIL_HOST')
Expand All @@ -382,8 +381,6 @@
'default': 'djcelery_email.backends.CeleryEmailBackend'
}
}
# celery-mail
CELERY_EMAIL_CHUNK_SIZE = 10

# crispy-forms
CRISPY_FAIL_SILENTLY = not DEBUG
Expand Down Expand Up @@ -460,6 +457,11 @@
CELERY_TASK_ALWAYS_EAGER = env.bool('CELERY_ALWAYS_EAGER')
CELERY_TASK_SERIALIZER = 'etljson'
CELERY_TIMEZONE = 'America/New_York'
CELERY_EMAIL_BACKEND = env.str(
'CELERY_EMAIL_BACKEND',
default='django.core.mail.backends.smtp.EmailBackend',
)
CELERY_EMAIL_CHUNK_SIZE = 10

CONCURRENCY_IGNORE_DEFAULT = False

Expand Down

0 comments on commit 60b84e1

Please sign in to comment.