diff --git a/bench/config.py b/bench/config.py index dfb5babb..fe474d84 100644 --- a/bench/config.py +++ b/bench/config.py @@ -156,8 +156,8 @@ def generate_redis_cache_config(bench='.'): def _generate_redis_config(template_name, context, bench): template = env.get_template(template_name) - if "process_files_path" not in context: - context["process_files_path"] = os.path.abspath(os.path.join(bench, "config", "files")) + if "pid_path" not in context: + context["pid_path"] = os.path.abspath(os.path.join(bench, "config", "files")) redis_config = template.render(**context) write_config_file(bench, template_name, redis_config) diff --git a/bench/templates/redis_async_broker.conf b/bench/templates/redis_async_broker.conf index 38237ef2..cd2a3699 100644 --- a/bench/templates/redis_async_broker.conf +++ b/bench/templates/redis_async_broker.conf @@ -1,4 +1,4 @@ dbfilename redis_async_broker.rdb -dir {{process_files_path}} -pidfile {{process_files_path}}/redis_async_broker.pid +dir {{pid_path}} +pidfile {{pid_path}}/redis_async_broker.pid port {{port}} diff --git a/bench/templates/redis_cache.conf b/bench/templates/redis_cache.conf index d9a80dcc..02e30351 100644 --- a/bench/templates/redis_cache.conf +++ b/bench/templates/redis_cache.conf @@ -1,6 +1,6 @@ dbfilename redis_cache_dump.rdb -dir {{process_files_path}} -pidfile {{process_files_path}}/redis_cache.pid +dir {{pid_path}} +pidfile {{pid_path}}/redis_cache.pid port {{port}} maxmemory {{maxmemory}}mb maxmemory-policy allkeys-lru diff --git a/bench/templates/redis_celery_broker.conf b/bench/templates/redis_celery_broker.conf index 6535eaa3..2af66730 100644 --- a/bench/templates/redis_celery_broker.conf +++ b/bench/templates/redis_celery_broker.conf @@ -1,4 +1,4 @@ dbfilename redis_celery_broker.rdb -dir {{process_files_path}} -pidfile {{process_files_path}}/redis_celery_broker.pid +dir {{pid_path}} +pidfile {{pid_path}}/redis_celery_broker.pid port {{port}} diff --git a/bench/utils.py b/bench/utils.py index 42aba665..19c513ab 100644 --- a/bench/utils.py +++ b/bench/utils.py @@ -33,7 +33,7 @@ default_config = { 'shallow_clone': True, } -folders_in_bench = ('apps', 'sites', 'config', 'logs', 'config/files') +folders_in_bench = ('apps', 'sites', 'config', 'logs', 'config/pids') def get_frappe(bench='.'): frappe = get_env_cmd('frappe', bench=bench)