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

Merge branch 'staging' into v5.x

Browse Source
This commit is contained in:
Ankush Menat 2024-02-03 17:41:12 +05:30
commit b8c429d287
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bench/config/procfile.py
View File

@ -1,19 +1,19 @@
# imports - standard imports
import os import os
import platform
# imports - third party imports
import click import click
# imports - module imports
import bench import bench
from bench.app import use_rq from bench.app import use_rq
from bench.utils import which
from bench.bench import Bench from bench.bench import Bench
from bench.utils import which
def setup_procfile(bench_path, yes=False, skip_redis=False): def setup_procfile(bench_path, yes=False, skip_redis=False):
config = Bench(bench_path).conf config = Bench(bench_path).conf
procfile_path = os.path.join(bench_path, "Procfile") procfile_path = os.path.join(bench_path, "Procfile")
is_mac = platform.system() == "Darwin"
if not yes and os.path.exists(procfile_path): if not yes and os.path.exists(procfile_path):
click.confirm( click.confirm(
"A Procfile already exists and this will overwrite it. Do you want to continue?", "A Procfile already exists and this will overwrite it. Do you want to continue?",
@ -30,6 +30,7 @@ def setup_procfile(bench_path, yes=False, skip_redis=False):
CI=os.environ.get("CI"), CI=os.environ.get("CI"),
skip_redis=skip_redis, skip_redis=skip_redis,
workers=config.get("workers", {}), workers=config.get("workers", {}),
is_mac=is_mac,
) )
) )

14
bench/config/templates/Procfile
View File

@ -5,18 +5,14 @@ redis_queue: redis-server config/redis_queue.conf
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
{% if not CI %} {% if not CI %}
watch: bench watch watch: bench watch
{% endif %} {% endif %}
{% if use_rq -%}
schedule: bench schedule schedule: bench schedule
worker: bench worker 1>> logs/worker.log 2>> logs/worker.error.log worker: {{ 'OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES NO_PROXY=*' if is_mac else '' }} bench worker 1>> logs/worker.log 2>> logs/worker.error.log
{% for worker_name, worker_details in workers.items() %} {% for worker_name, worker_details in workers.items() %}
worker_{{ worker_name }}: bench worker --queue {{ worker_name }} 1>> logs/worker.log 2>> logs/worker.error.log worker_{{ worker_name }}: {{ 'OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES NO_PROXY=*' if is_mac else '' }} bench worker --queue {{ worker_name }} 1>> logs/worker.log 2>> logs/worker.error.log
{% endfor %} {% endfor %}
{% else %}
workerbeat: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app beat -s scheduler.schedule'
worker: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker -n jobs@%h -Ofair --soft-time-limit 360 --time-limit 390'
longjob_worker: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker -n longjobs@%h -Ofair --soft-time-limit 1500 --time-limit 1530'
async_worker: sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker -n async@%h -Ofair --soft-time-limit 1500 --time-limit 1530'
{%- endif %}