diff --git a/bench/cli.py b/bench/cli.py index e09e6010..8a8de86b 100644 --- a/bench/cli.py +++ b/bench/cli.py @@ -407,7 +407,7 @@ def _prime_wheel_cache(): prime_wheel_cache(bench='.') @click.command('release') -@click.argument('app', type=click.Choice(['frappe', 'erpnext', 'shopping_cart'])) +@click.argument('app', type=click.Choice(['frappe', 'erpnext', 'erpnext_shopify', 'paypal_integration'])) @click.argument('bump-type', type=click.Choice(['major', 'minor', 'patch'])) @click.option('--develop', default='develop') @click.option('--master', default='master') diff --git a/bench/templates/supervisor.conf b/bench/templates/supervisor.conf index fffd6b73..4808123d 100644 --- a/bench/templates/supervisor.conf +++ b/bench/templates/supervisor.conf @@ -8,12 +8,33 @@ user={{ user }} directory={{ sites_dir }} [program:frappe-worker] -command={{ bench_dir }}/env/bin/python -m frappe.celery_app worker +command={{ bench_dir }}/env/bin/python -m frappe.celery_app worker -n jobs@%%h --time-limit 360 --loglevel INFO -Ofair autostart=true autorestart=true stdout_logfile={{ bench_dir }}/logs/worker.log stderr_logfile={{ bench_dir }}/logs/worker.error.log user={{ user }} +stopwaitsecs=370 +directory={{ sites_dir }} + +[program:frappe-longjob-worker] +command={{ bench_dir }}/env/bin/python -m frappe.celery_app worker -n longjobs@%%h --time-limit 1500 --loglevel INFO +autostart=true +autorestart=true +stdout_logfile={{ bench_dir }}/logs/worker.log +stderr_logfile={{ bench_dir }}/logs/worker.error.log +user={{ user }} +stopwaitsecs=1510 +directory={{ sites_dir }} + +[program:frappe-async-worker] +command={{ bench_dir }}/env/bin/python -m frappe.celery_app worker -n async@%%h --time-limit 1500 --loglevel INFO +autostart=true +autorestart=true +stdout_logfile={{ bench_dir }}/logs/worker.log +stderr_logfile={{ bench_dir }}/logs/worker.error.log +user={{ user }} +stopwaitsecs=1510 directory={{ sites_dir }} [program:frappe-workerbeat] diff --git a/bench/utils.py b/bench/utils.py index 61d47dc9..df51fe57 100644 --- a/bench/utils.py +++ b/bench/utils.py @@ -120,6 +120,8 @@ def setup_procfile(with_celery_broker=False, with_watch=False, bench='.'): procfile_contents = { 'web': "./env/bin/frappe --serve --sites_path sites", 'worker': "sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app worker'", + 'longjob_worker': "sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app -n longjobs@%%h worker'", + 'async_worker': "sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app -n async@%%h worker'", 'workerbeat': "sh -c 'cd sites && exec ../env/bin/python -m frappe.celery_app beat -s scheduler.schedule'" } if frappe_version > 4: