From 7b93016d02046b668d6baaaee7e498fe55933438 Mon Sep 17 00:00:00 2001 From: wraymo Date: Wed, 10 Jan 2024 12:01:09 -0500 Subject: [PATCH] rename url and add db_name to clp_config.yml --- .../job_orchestration/executor/search_task.py | 6 +++--- components/package-template/src/etc/clp-config.yml | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/components/job-orchestration/job_orchestration/executor/search_task.py b/components/job-orchestration/job_orchestration/executor/search_task.py index 13738c0135..4e1602b616 100644 --- a/components/job-orchestration/job_orchestration/executor/search_task.py +++ b/components/job-orchestration/job_orchestration/executor/search_task.py @@ -16,7 +16,7 @@ def run_clo(job_id: int, task_id: int, clp_home: pathlib.Path, archive_output_dir: pathlib.Path, logs_dir: pathlib.Path, search_config: SearchConfig, archive_id: str, - results_cache_url: str, results_cache_db_name: str): + results_cache_uri: str, results_cache_db_name: str): """ Searches the given archive for the given wildcard query @@ -27,14 +27,14 @@ def run_clo(job_id: int, task_id: int, clp_home: pathlib.Path, archive_output_di :param logs_dir: :param search_config: :param archive_id: - :param results_cache_url: + :param results_cache_uri: :param results_cache_db_name: :return: tuple -- (whether the search was successful, output messages) """ # Assemble search command cmd = [ str(clp_home / 'bin' / 'clo'), - results_cache_url, + results_cache_uri, results_cache_db_name, str(job_id), str(archive_output_dir / archive_id), diff --git a/components/package-template/src/etc/clp-config.yml b/components/package-template/src/etc/clp-config.yml index 3c0b947848..1882f8270b 100644 --- a/components/package-template/src/etc/clp-config.yml +++ b/components/package-template/src/etc/clp-config.yml @@ -23,6 +23,7 @@ #results_cache: # host: "localhost" # port: 27017 +# db_name: "clp-search" # ## Where archives should be output to #archive_output: