opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add broker and backend defaults as null

Browse Source 
This will keep the values in the sample config.
This commit is contained in:
davelopez
2024-04-10 18:23:52 +02:00
parent a739ed1cb8
commit 514df55323
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/admin/galaxy_options.rst
+5 -5
View File
@@ -5172,16 +5172,16 @@
To refer to a task by name, use the template `galaxy.foo` where
`foo` is the function name of the task defined in the
galaxy.celery.tasks module.
The `broker_url` option, if unset, defaults to the value of
`amqp_internal_connection`. The `result_backend` option, if unset,
defaults to an SQLite database at '<data_dir>/results.sqlite' for
storing task results.
The `broker_url` option, if unset or null, defaults to the value
of `amqp_internal_connection`. The `result_backend` option, if
unset or null, defaults to an SQLite database at
'<data_dir>/results.sqlite' for storing task results.
The galaxy.fetch_data task can be disabled by setting its route to
"disabled": `galaxy.fetch_data: disabled`. (Other tasks cannot be
disabled on a per-task basis at this time.)
For details, see Celery documentation at
https://docs.celeryq.dev/en/stable/userguide/configuration.html.
:Default: ``{'task_routes': {'galaxy.fetch_data': 'galaxy.external', 'galaxy.set_job_metadata': 'galaxy.external'}}``
:Default: ``{'broker_url': None, 'result_backend': None, 'task_routes': {'galaxy.fetch_data': 'galaxy.external', 'galaxy.set_job_metadata': 'galaxy.external'}}``
:Type: any
lib/galaxy/config/sample/galaxy.yml.sample
+6 -4
View File
@@ -2772,16 +2772,18 @@ galaxy:
# To refer to a task by name, use the template `galaxy.foo` where
# `foo` is the function name of the task defined in the
# galaxy.celery.tasks module.
# The `broker_url` option, if unset, defaults to the value of
# `amqp_internal_connection`. The `result_backend` option, if unset,
# defaults to an SQLite database at '<data_dir>/results.sqlite' for
# storing task results.
# The `broker_url` option, if unset or null, defaults to the value of
# `amqp_internal_connection`. The `result_backend` option, if unset or
# null, defaults to an SQLite database at '<data_dir>/results.sqlite'
# for storing task results.
# The galaxy.fetch_data task can be disabled by setting its route to
# "disabled": `galaxy.fetch_data: disabled`. (Other tasks cannot be
# disabled on a per-task basis at this time.)
# For details, see Celery documentation at
# https://docs.celeryq.dev/en/stable/userguide/configuration.html.
#celery_conf:
# broker_url: null
# result_backend: null
# task_routes:
# galaxy.fetch_data: galaxy.external
# galaxy.set_job_metadata: galaxy.external
lib/galaxy/config/schemas/config_schema.yml
+4 -2
View File
@@ -3772,6 +3772,8 @@ mapping:
type: any
required: false
default:
broker_url: null
result_backend: null
task_routes:
'galaxy.fetch_data': 'galaxy.external'
'galaxy.set_job_metadata': 'galaxy.external'
@@ -3781,8 +3783,8 @@ mapping:
To refer to a task by name, use the template `galaxy.foo` where `foo` is the function name
of the task defined in the galaxy.celery.tasks module.
The `broker_url` option, if unset, defaults to the value of `amqp_internal_connection`.
The `result_backend` option, if unset, defaults to an SQLite database at '<data_dir>/results.sqlite'
The `broker_url` option, if unset or null, defaults to the value of `amqp_internal_connection`.
The `result_backend` option, if unset or null, defaults to an SQLite database at '<data_dir>/results.sqlite'
for storing task results.
The galaxy.fetch_data task can be disabled by setting its route to "disabled": `galaxy.fetch_data: disabled`.