From cef18e50d5098744f8b58bfe9610672e04759839 Mon Sep 17 00:00:00 2001
From: Dmitriy Shesterkin <mitri4@bk.ru>
Date: Thu, 29 Jun 2017 11:31:50 +0300
Subject: [PATCH] add flower

---
 Makefile                          |  4 ++++
 conf/nginx.conf                   | 15 +++++++++++++++
 conf/supervisor.conf              | 10 ++++++++++
 requirements/base.txt             |  1 +
 src/dokumentor/settings/common.py |  2 ++
 5 files changed, 32 insertions(+)

diff --git a/Makefile b/Makefile
index 29b9d45..d2c2342 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,10 @@ clean: clean_temp clean_venv clean_db
 worker:
 	celery -A src.dokumentor worker -l info -E -B
 
+# target: flower - Run celery flower on port 5555
+flower:
+	celery -A src.dokumentor flower -l info -E -B  --port=5555
+
 # target: qa - Run pytest
 qa:
 	pytest
diff --git a/conf/nginx.conf b/conf/nginx.conf
index d8cca73..65af230 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -21,6 +21,10 @@ http {
         server unix:/tmp/gunicorn.sock fail_timeout=0;
     }
 
+    upstream flower {
+        server unix:/tmp/daphne.sock fail_timeout=0;
+    }
+
     server {
         listen 80;
         server_name _;
@@ -39,6 +43,17 @@ http {
             expires 30d;
         }
 
+        location /flower {
+            proxy_pass   http://flower;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_set_header Host $http_host;
+            proxy_connect_timeout 86400;
+            proxy_read_timeout 86400;
+            proxy_send_timeout 86400;
+        }
+
         location / {
             proxy_set_header Host $http_host;
             proxy_set_header X-Real-IP $remote_addr;
diff --git a/conf/supervisor.conf b/conf/supervisor.conf
index f44a56d..6e0cb02 100644
--- a/conf/supervisor.conf
+++ b/conf/supervisor.conf
@@ -36,6 +36,16 @@ autorestart=true
 startsecs=10
 stopwaitsecs=600
 
+[program:flower]
+command=celery -A src.dokumentor flower -l info -E -B --unix_socket=/tmp/flower.sock
+directory=/opt/app
+stdout_logfile=/var/log/celery-flower.log
+stderr_logfile=/var/log/celery-flower-error.log
+autostart=true
+autorestart=true
+startsecs=10
+stopwaitsecs=600
+
 
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
diff --git a/requirements/base.txt b/requirements/base.txt
index 4859749..85c95bf 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -72,3 +72,4 @@ redis==2.10.5
 trans==2.1.0
 python-decouple==3.0
 numpy==1.13.0
+flower==0.9.2
diff --git a/src/dokumentor/settings/common.py b/src/dokumentor/settings/common.py
index e712af6..aa5e085 100644
--- a/src/dokumentor/settings/common.py
+++ b/src/dokumentor/settings/common.py
@@ -257,6 +257,8 @@ CMS_PERMISSION = True
 BROKER_URL = e.get('CELERY_BROKER_URL')
 CELERY_RESULT_BACKEND = e.get('CELERY_RESULT_BACKEND')
 
+CELERY_IGNORE_RESULT = True
+
 CELERY_TIMEZONE = 'Europe/Moscow'
 
 CALLBACK_SETTINGS = {