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

Merge remote-tracking branch 'upstream/release_21.01' into dev

Browse Source
This commit is contained in:
Nate Coraor
2021-01-22 11:11:57 -05:00
parent 6f7e8c4296 b5ed5022cf
commit 7c65d777c1
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/runners/pulsar.py
+8 -1
View File
@@ -370,7 +370,14 @@ class PulsarJobRunner(AsynchronousJobRunner):
else:
metadata_directory = os.path.join(job_wrapper.working_directory, "metadata")
remote_pulsar_app_config = job_destination.params.get("pulsar_app_config", {})
dest_params = job_destination.params
remote_pulsar_app_config = dest_params.get("pulsar_app_config", None)
if remote_pulsar_app_config is None and "pulsar_app_config_path" in dest_params:
pulsar_app_config_path = dest_params["pulsar_app_config_path"]
with open(pulsar_app_config_path, "r") as fh:
remote_pulsar_app_config = yaml.safe_load(fh)
elif remote_pulsar_app_config is None:
remote_pulsar_app_config = {}
job_directory_files = []
config_files = job_wrapper.extra_filenames
tool_script = os.path.join(job_wrapper.working_directory, "tool_script.sh")