From d454a8c872ed6a0f092a53a8fd84f5ac23b6fabe Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 29 Jun 2017 14:11:49 +0300
Subject: [PATCH] fix flower

---
 conf/nginx.conf                   |  3 ++-
 docker-compose.yml                |  4 +---
 src/customer/tasks.py             |  4 ++--
 src/dokumentor/celery.py          | 14 ++++++++++++++
 src/dokumentor/settings/common.py |  1 +
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index 65af230..15479ab 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -22,7 +22,7 @@ http {
     }
 
     upstream flower {
-        server unix:/tmp/daphne.sock fail_timeout=0;
+        server unix:/tmp/flower.sock fail_timeout=0;
     }
 
     server {
@@ -46,6 +46,7 @@ http {
         location /flower {
             proxy_pass   http://flower;
             proxy_http_version 1.1;
+            proxy_redirect off;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "upgrade";
             proxy_set_header Host $http_host;
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e480dc..e967751 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,6 @@ services:
             - db
             - redis
             - rabbitmq
-            - bower
 
     db:
         restart: always
@@ -47,9 +46,8 @@ services:
             - "5671"
 
     bower:
-        restart: always
         container_name: dokumentor-bower
         image: digitallyseamless/nodejs-bower-grunt
-        command: bash -c "bower i"
+            command: bash -c "cd /opt/app && bower i"
         volumes:
             - ./:/opt/app
diff --git a/src/customer/tasks.py b/src/customer/tasks.py
index 11422f2..25a221e 100644
--- a/src/customer/tasks.py
+++ b/src/customer/tasks.py
@@ -49,7 +49,7 @@ def delete_not_activated_users():
     """
     today = timezone.now().date()
     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)
     if users:
         for user in users:
@@ -73,7 +73,7 @@ def send_offer_for_get_bonus():
     today = timezone.now().date()
     date_join_start = today - timezone.timedelta(days=9)
     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)
 
     for user in users:
diff --git a/src/dokumentor/celery.py b/src/dokumentor/celery.py
index 207230d..e313ac6 100644
--- a/src/dokumentor/celery.py
+++ b/src/dokumentor/celery.py
@@ -6,3 +6,17 @@ from django.conf import settings  # noqa
 app = Celery('dokumentor')
 app.config_from_object('django.conf:settings', namespace='CELERY')
 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)
diff --git a/src/dokumentor/settings/common.py b/src/dokumentor/settings/common.py
index e92125c..ea3f8c8 100644
--- a/src/dokumentor/settings/common.py
+++ b/src/dokumentor/settings/common.py
@@ -147,6 +147,7 @@ INSTALLED_APPS = [
     'mptt',  # utilities for implementing a modified pre-order traversal tree
     'menus',  # helper for model independent hierarchical website navigation
     'sekizai',  # for javascript and css management
+    'django_celery_beat',
 
     # 'cmsplugin_filer_file',
     # 'cmsplugin_filer_folder',