accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-09 16:36:25 +00:00
Code Issues Releases Activity

feat(procfile): dont add redis to procfile if skipping config gen

Browse Source 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
This commit is contained in:
Chinmay D. Pai 2020-03-05 18:26:48 +05:30
parent 189d0c7d38
commit 4c173ded26
No known key found for this signature in database
GPG Key ID: 75507BE256F40CED
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bench/config/procfile.py
View File

@ -3,7 +3,7 @@ from bench.utils import find_executable
from bench.app import use_rq from bench.app import use_rq
from bench.config.common_site_config import get_config from bench.config.common_site_config import get_config
def setup_procfile(bench_path, yes=False): def setup_procfile(bench_path, yes=False, setup_redis=True):
config = get_config(bench_path=bench_path) config = get_config(bench_path=bench_path)
procfile_path = os.path.join(bench_path, 'Procfile') procfile_path = os.path.join(bench_path, 'Procfile')
if not yes and os.path.exists(procfile_path): if not yes and os.path.exists(procfile_path):
@ -14,7 +14,8 @@ def setup_procfile(bench_path, yes=False):
node=find_executable("node") or find_executable("nodejs"), node=find_executable("node") or find_executable("nodejs"),
use_rq=use_rq(bench_path), use_rq=use_rq(bench_path),
webserver_port=config.get('webserver_port'), webserver_port=config.get('webserver_port'),
CI=os.environ.get('CI')) CI=os.environ.get('CI'),
setup_redis=setup_redis)
with open(procfile_path, 'w') as f: with open(procfile_path, 'w') as f:
f.write(procfile) f.write(procfile)

2
bench/config/templates/Procfile
View File

@ -1,6 +1,8 @@
{% if setup_redis %}
redis_cache: redis-server config/redis_cache.conf redis_cache: redis-server config/redis_cache.conf
redis_socketio: redis-server config/redis_socketio.conf redis_socketio: redis-server config/redis_socketio.conf
redis_queue: redis-server config/redis_queue.conf redis_queue: redis-server config/redis_queue.conf
{% endif %}
web: bench serve {% if webserver_port -%} --port {{ webserver_port }} {%- endif %} web: bench serve {% if webserver_port -%} --port {{ webserver_port }} {%- endif %}
socketio: {{ node }} apps/frappe/socketio.js socketio: {{ node }} apps/frappe/socketio.js

2
bench/utils.py
View File

@ -147,7 +147,7 @@ def init(path, apps_path=None, no_procfile=False, no_backups=False,
redis.generate_config(path) redis.generate_config(path)
if not no_procfile: if not no_procfile:
setup_procfile(path) setup_procfile(path, setup_redis=skip_redis_config_generation)
if not no_backups: if not no_backups:
setup_backups(bench_path=path) setup_backups(bench_path=path)