accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-17 02:25:16 +00:00
Code Issues Releases Activity

Merge pull request #1126 from revant/setup-supervisor-skip-redis

Browse Source 
feat: skip redis config during supervisor setup
This commit is contained in:
gavin 2021-03-17 17:42:04 +05:30 committed by GitHub
commit 8a7a532a45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bench/commands/setup.py
View File

@ -43,9 +43,10 @@ def reload_nginx():
@click.command("supervisor", help="Generate configuration for supervisor") @click.command("supervisor", help="Generate configuration for supervisor")
@click.option("--user", help="optional user argument") @click.option("--user", help="optional user argument")
@click.option("--yes", help="Yes to regeneration of supervisor config", is_flag=True, default=False) @click.option("--yes", help="Yes to regeneration of supervisor config", is_flag=True, default=False)
def setup_supervisor(user=None, yes=False): @click.option("--skip-redis", help="Skip redis configuration", is_flag=True, default=False)
def setup_supervisor(user=None, yes=False, skip_redis=False):
bench.config.supervisor.update_supervisord_config(user=user, yes=yes) bench.config.supervisor.update_supervisord_config(user=user, yes=yes)
bench.config.supervisor.generate_supervisor_config(bench_path=".", user=user, yes=yes) bench.config.supervisor.generate_supervisor_config(bench_path=".", user=user, yes=yes, skip_redis=skip_redis)
@click.command("redis", help="Generates configuration for Redis") @click.command("redis", help="Generates configuration for Redis")

5
bench/config/supervisor.py
View File

@ -16,7 +16,7 @@ import click
logger = logging.getLogger(bench.PROJECT_NAME) logger = logging.getLogger(bench.PROJECT_NAME)
def generate_supervisor_config(bench_path, user=None, yes=False): def generate_supervisor_config(bench_path, user=None, yes=False, skip_redis=False):
"""Generate supervisor config for respective bench path""" """Generate supervisor config for respective bench path"""
if not user: if not user:
user = getpass.getuser() user = getpass.getuser()
@ -41,7 +41,8 @@ def generate_supervisor_config(bench_path, user=None, yes=False):
"gunicorn_workers": config.get('gunicorn_workers', get_gunicorn_workers()["gunicorn_workers"]), "gunicorn_workers": config.get('gunicorn_workers', get_gunicorn_workers()["gunicorn_workers"]),
"bench_name": get_bench_name(bench_path), "bench_name": get_bench_name(bench_path),
"background_workers": config.get('background_workers') or 1, "background_workers": config.get('background_workers') or 1,
"bench_cmd": find_executable('bench') "bench_cmd": find_executable('bench'),
"skip_redis": skip_redis,
}) })
conf_path = os.path.join(bench_path, 'config', 'supervisor.conf') conf_path = os.path.join(bench_path, 'config', 'supervisor.conf')

6
bench/config/templates/supervisor.conf
View File

@ -114,6 +114,7 @@ killasgroup=true
{% endif %} {% endif %}
{% if not skip_redis %}
[program:{{ bench_name }}-redis-cache] [program:{{ bench_name }}-redis-cache]
command={{ redis_server }} {{ redis_cache_config }} command={{ redis_server }} {{ redis_cache_config }}
priority=1 priority=1
@ -133,8 +134,10 @@ stdout_logfile={{ bench_dir }}/logs/redis-queue.log
stderr_logfile={{ bench_dir }}/logs/redis-queue.error.log stderr_logfile={{ bench_dir }}/logs/redis-queue.error.log
user={{ user }} user={{ user }}
directory={{ sites_dir }} directory={{ sites_dir }}
{% endif %}
{% if frappe_version > 5 %} {% if frappe_version > 5 %}
{% if not skip_redis %}
[program:{{ bench_name }}-redis-socketio] [program:{{ bench_name }}-redis-socketio]
command={{ redis_server }} {{ redis_socketio_config }} command={{ redis_server }} {{ redis_socketio_config }}
priority=1 priority=1
@ -144,6 +147,7 @@ stdout_logfile={{ bench_dir }}/logs/redis-socketio.log
stderr_logfile={{ bench_dir }}/logs/redis-socketio.error.log stderr_logfile={{ bench_dir }}/logs/redis-socketio.error.log
user={{ user }} user={{ user }}
directory={{ sites_dir }} directory={{ sites_dir }}
{% endif %}
{% if node %} {% if node %}
[program:{{ bench_name }}-node-socketio] [program:{{ bench_name }}-node-socketio]
@ -174,5 +178,7 @@ programs={{ bench_name }}-frappe-workerbeat,{{ bench_name }}-frappe-worker,{{ be
{% endif %} {% endif %}
{% if not skip_redis %}
[group:{{ bench_name }}-redis] [group:{{ bench_name }}-redis]
programs={{ bench_name }}-redis-cache,{{ bench_name }}-redis-queue {%- if frappe_version > 5 -%} ,{{ bench_name }}-redis-socketio {%- endif %} programs={{ bench_name }}-redis-cache,{{ bench_name }}-redis-queue {%- if frappe_version > 5 -%} ,{{ bench_name }}-redis-socketio {%- endif %}
{% endif %}