From 6612c6d6ca5cbb5bd32aefd4f2ded84e940ee23f Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 5 May 2016 16:23:00 +0530
Subject: [PATCH] [fix] use_rq

---
 bench/app.py                           | 5 +++++
 bench/config/procfile.py               | 5 ++---
 bench/config/supervisor.py             | 4 ++--
 bench/config/templates/Procfile        | 1 -
 bench/config/templates/supervisor.conf | 1 -
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bench/app.py b/bench/app.py
index cc5177a1..4f0a7915 100644
--- a/bench/app.py
+++ b/bench/app.py
@@ -117,6 +117,11 @@ def get_current_branch(app, bench='.'):
 	repo_dir = get_repo_dir(app, bench=bench)
 	return get_cmd_output("basename $(git symbolic-ref -q HEAD)", cwd=repo_dir)
 
+def use_rq(bench_path):
+	bench_path = os.path.abspath(bench_path)
+	celery_app = os.path.join(bench_path, 'apps', 'frappe', 'frappe', 'celery_app.py')
+	return not os.path.exists(celery_app)
+
 def fetch_upstream(app, bench='.'):
 	repo_dir = get_repo_dir(app, bench=bench)
 	return exec_cmd("git fetch upstream", cwd=repo_dir)
diff --git a/bench/config/procfile.py b/bench/config/procfile.py
index 1f1553dc..5fa47124 100644
--- a/bench/config/procfile.py
+++ b/bench/config/procfile.py
@@ -1,6 +1,6 @@
 import bench, os, click
 from bench.utils import find_executable
-from bench.app import get_current_frappe_version, get_current_branch
+from bench.app import use_rq
 from bench.config.common_site_config import get_config
 
 def setup_procfile(bench_path, force=False):
@@ -12,8 +12,7 @@ def setup_procfile(bench_path, force=False):
 
 	procfile = bench.env.get_template('Procfile').render(
 		node=find_executable("node") or find_executable("nodejs"),
-		frappe_version=get_current_frappe_version(bench_path),
-		frappe_branch=get_current_branch('frappe', bench_path),
+		use_rq=use_rq(bench_path),
 		webserver_port=config.get('webserver_port'))
 
 	with open(procfile_path, 'w') as f:
diff --git a/bench/config/supervisor.py b/bench/config/supervisor.py
index 0fb12045..b11bb8d6 100644
--- a/bench/config/supervisor.py
+++ b/bench/config/supervisor.py
@@ -2,7 +2,7 @@ import os, getpass, click
 import bench
 
 def generate_supervisor_config(bench_path, user=None, force=False):
-	from bench.app import get_current_frappe_version, get_current_branch
+	from bench.app import get_current_frappe_version, use_rq
 	from bench.utils import get_bench_name, find_executable
 	from bench.config.common_site_config import get_config, update_config, get_gunicorn_workers
 
@@ -19,7 +19,7 @@ def generate_supervisor_config(bench_path, user=None, force=False):
 		"sites_dir": os.path.join(bench_dir, 'sites'),
 		"user": user,
 		"frappe_version": get_current_frappe_version(bench_path),
-		"frappe_branch": get_current_branch('frappe', bench_path),
+		"use_rq": use_rq(bench_path),
 		"http_timeout": config.get("http_timeout", 120),
 		"redis_server": find_executable('redis-server'),
 		"node": find_executable('node') or find_executable('nodejs'),
diff --git a/bench/config/templates/Procfile b/bench/config/templates/Procfile
index a01f2016..9a1e3ce2 100644
--- a/bench/config/templates/Procfile
+++ b/bench/config/templates/Procfile
@@ -1,4 +1,3 @@
-{%- set use_rq = (frappe_branch=='develop' or frappe_version >= 7) -%}
 redis_cache: redis-server config/redis_cache.conf
 redis_socketio: redis-server config/redis_socketio.conf
 redis_queue: redis-server config/redis_queue.conf
diff --git a/bench/config/templates/supervisor.conf b/bench/config/templates/supervisor.conf
index 74c0a9d0..a0fbf6a8 100644
--- a/bench/config/templates/supervisor.conf
+++ b/bench/config/templates/supervisor.conf
@@ -1,4 +1,3 @@
-{%- set use_rq = (frappe_branch=='develop' or frappe_version >= 7) -%}
 ; Notes:
 ; priority=1 --> Lower priorities indicate programs that start first and shut down last
 ; killasgroup=true --> send kill signal to child processes too