From 4bb1a35c9b06245b9af63a94b00c2431667b6e8e Mon Sep 17 00:00:00 2001
From: Arthur Le Bars <arthur.le-bars@sb-roscoff.fr>
Date: Tue, 23 Mar 2021 11:36:31 +0100
Subject: [PATCH] connection to instance fix
---
gga_load_data.py | 3 ++-
run_workflow_phaeoexplorer.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gga_load_data.py b/gga_load_data.py
index 52902a0..d961dda 100644
--- a/gga_load_data.py
+++ b/gga_load_data.py
@@ -364,7 +364,8 @@ if __name__ == "__main__":
# Parse the config yaml file
load_data_for_current_species.config = utilities.parse_config(args.config)
# Set the instance url attribute -- Does not work with localhost on scratch (ALB)
- load_data_for_current_species.instance_url = "http://localhost/sp/{0}_{1}/galaxy/".format(
+ load_data_for_current_species.instance_url = "http://localhost:{0}/sp/{1}_{2}/galaxy/".format(
+ load_data_for_current_species.config["http_port"],
load_data_for_current_species.genus_lowercase,
load_data_for_current_species.species)
diff --git a/run_workflow_phaeoexplorer.py b/run_workflow_phaeoexplorer.py
index 27645dc..cdc782c 100644
--- a/run_workflow_phaeoexplorer.py
+++ b/run_workflow_phaeoexplorer.py
@@ -851,7 +851,8 @@ if __name__ == "__main__":
# Parse the config yaml file
run_workflow_for_current_organism.config = utilities.parse_config(args.config)
# Set the instance url attribute --> TODO: the localhost rule in the docker-compose still doesn't work on scratchgmodv1
- run_workflow_for_current_organism.instance_url = "http://localhost/sp/{0}_{1}/galaxy/".format(
+ run_workflow_for_current_organism.instance_url = "http://localhost:{0}/sp/{1}_{2}/galaxy/".format(
+ run_workflow_for_current_organism.config["http_port"],
run_workflow_for_current_organism.genus_lowercase,
run_workflow_for_current_organism.species)
--
GitLab