put delayed mailer back in and break purchases for testing

This commit is contained in:
Andy McKay 2011-12-30 11:47:47 -08:00
Родитель 7939869b0d
Коммит 411cfb8bd8
4 изменённых файлов: 4 добавлений и 3 удалений

Просмотреть файл

@ -748,6 +748,7 @@ class PurchasesFilter(BaseFilter):
@waffle_switch('marketplace')
def purchases(request, addon_id=None, template=None):
"""A list of purchases that a user has made through the marketplace."""
1/0
webapp = settings.APP_PREVIEW
cs = (Contribution.objects
.filter(user=request.amo_user,

Просмотреть файл

@ -83,7 +83,7 @@ cfg = {
},
'mail_admins': {
'level': 'ERROR',
'class': 'admin_log.AdminEmailHandler'
'class': 'delayed_mailer.log.DelayedEmailHandler'
},
},
'loggers': {

Просмотреть файл

@ -977,7 +977,7 @@ BROKER_VHOST = 'zamboni'
BROKER_CONNECTION_TIMEOUT = 0.1
CELERY_RESULT_BACKEND = 'amqp'
CELERY_IGNORE_RESULT = True
CELERY_IMPORTS = ('django_arecibo.tasks',)
CELERY_IMPORTS = ('django_arecibo.tasks', 'delayed_mailer.tasks')
# We have separate celeryds for processing devhub & images as fast as possible
# Some notes:
# - always add routes here instead of @task(queue=<name>)

2
vendor

@ -1 +1 @@
Subproject commit 7eda8911560450ddb190205c1ba21aa45426d93f
Subproject commit 3463f5888506bb9aca7dfdadcde5538ea3ca623d