Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[15.0][FIX] queue_job test #579

Closed
wants to merge 9 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion queue_job/jobrunner/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
or ``False`` if unset.
- ``ODOO_QUEUE_JOB_JOBRUNNER_DB_PASSWORD=passdb``, default ``db_password``
or ``False`` if unset.
- ``ODOO_QUEUE_JOB_JOBRUNNER_DB_NAME=firstdb,seconddb``, default ``db_name``

* Alternatively, configure the channels through the Odoo configuration
file, like:
Expand All @@ -54,6 +55,7 @@
http_auth_password = s3cr3t
jobrunner_db_host = master-db
jobrunner_db_port = 5432
jobrunner_db_name = firstdb,seconddb
jobrunner_db_user = userdb
jobrunner_db_password = passdb

Expand Down Expand Up @@ -398,7 +400,26 @@ def from_environ_or_config(cls):
return runner

def get_db_names(self):
if config["db_name"]:
"""
Get the database names based on certain conditions.
>>> runner = QueueJobRunner()
>>> config["db_name"] = "db3,db4"
>>> runner.get_db_names()
['db3', 'db4']

>>> config["db_name"] = None
>>> runner.get_db_names()
['odoo']

>>> os.environ["ODOO_QUEUE_JOB_JOBRUNNER_DB_NAME"] = "db1,db2"
>>> runner.get_db_names()
['db1', 'db2']
"""
if os.environ.get("ODOO_QUEUE_JOB_JOBRUNNER_DB_NAME"):
db_names = os.environ["ODOO_QUEUE_JOB_JOBRUNNER_DB_NAME"].split(",")
elif queue_job_config.get("jobrunner_db_name"):
db_names = queue_job_config["jobrunner_db_name"].split(",")
elif config["db_name"]:
db_names = config["db_name"].split(",")
else:
db_names = odoo.service.db.exp_list(True)
Expand Down
Loading