prod
Dmitriy Shesterkin 9 years ago
parent 9a3c9ab81a
commit d454a8c872
  1. 3
      conf/nginx.conf
  2. 4
      docker-compose.yml
  3. 4
      src/customer/tasks.py
  4. 14
      src/dokumentor/celery.py
  5. 1
      src/dokumentor/settings/common.py

@ -22,7 +22,7 @@ http {
} }
upstream flower { upstream flower {
server unix:/tmp/daphne.sock fail_timeout=0; server unix:/tmp/flower.sock fail_timeout=0;
} }
server { server {
@ -46,6 +46,7 @@ http {
location /flower { location /flower {
proxy_pass http://flower; proxy_pass http://flower;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_redirect off;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host; proxy_set_header Host $http_host;

@ -14,7 +14,6 @@ services:
- db - db
- redis - redis
- rabbitmq - rabbitmq
- bower
db: db:
restart: always restart: always
@ -47,9 +46,8 @@ services:
- "5671" - "5671"
bower: bower:
restart: always
container_name: dokumentor-bower container_name: dokumentor-bower
image: digitallyseamless/nodejs-bower-grunt image: digitallyseamless/nodejs-bower-grunt
command: bash -c "bower i" command: bash -c "cd /opt/app && bower i"
volumes: volumes:
- ./:/opt/app - ./:/opt/app

@ -49,7 +49,7 @@ def delete_not_activated_users():
""" """
today = timezone.now().date() today = timezone.now().date()
date_join = today - timezone.timedelta(days=5) date_join = today - timezone.timedelta(days=5)
users = DokUser.objects.filter(profile__active=False, profile__confirmed=False).\ users = DokUser.objects.filter(profile__active=False, profile__confirmed=False). \
filter(date_joined__lte=date_join) filter(date_joined__lte=date_join)
if users: if users:
for user in users: for user in users:
@ -73,7 +73,7 @@ def send_offer_for_get_bonus():
today = timezone.now().date() today = timezone.now().date()
date_join_start = today - timezone.timedelta(days=9) date_join_start = today - timezone.timedelta(days=9)
date_join_end = today - timezone.timedelta(days=8) date_join_end = today - timezone.timedelta(days=8)
users = DokUser.objects.filter(profile__active=True, profile__confirmed=True).\ users = DokUser.objects.filter(profile__active=True, profile__confirmed=True). \
filter(date_joined__gt=date_join_start, date_joined__lte=date_join_end) filter(date_joined__gt=date_join_start, date_joined__lte=date_join_end)
for user in users: for user in users:

@ -6,3 +6,17 @@ from django.conf import settings # noqa
app = Celery('dokumentor') app = Celery('dokumentor')
app.config_from_object('django.conf:settings', namespace='CELERY') app.config_from_object('django.conf:settings', namespace='CELERY')
app.autodiscover_tasks() app.autodiscover_tasks()
# @app.on_after_configure.connect
# def setup_periodic_tasks(sender, **kwargs):
# # Calls test('hello') every 10 seconds.
# sender.add_periodic_task(10.0, test.s('hello'), name='add every 10')
#
# # Calls test('world') every 30 seconds
# sender.add_periodic_task(30.0, test.s('world'), expires=10)
#
#
# @app.task
# def test(arg):
# print(arg)

@ -147,6 +147,7 @@ INSTALLED_APPS = [
'mptt', # utilities for implementing a modified pre-order traversal tree 'mptt', # utilities for implementing a modified pre-order traversal tree
'menus', # helper for model independent hierarchical website navigation 'menus', # helper for model independent hierarchical website navigation
'sekizai', # for javascript and css management 'sekizai', # for javascript and css management
'django_celery_beat',
# 'cmsplugin_filer_file', # 'cmsplugin_filer_file',
# 'cmsplugin_filer_folder', # 'cmsplugin_filer_folder',

Loading…
Cancel
Save