From 55c929768cb4e2fd9f3169b5359eb570462dbf9b Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Tue, 20 Aug 2019 16:58:55 -0400 Subject: [PATCH] more realtime to interactivetools name changes --- .../{galaxy.yml.realtime => galaxy.yml.interactivetools} | 8 ++++---- lib/galaxy/config/__init__.py | 7 ++++--- .../key_type_token_mapping.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) rename config/{galaxy.yml.realtime => galaxy.yml.interactivetools} (84%) rename scripts/{realtime => interactivetools}/key_type_token_mapping.py (98%) diff --git a/config/galaxy.yml.realtime b/config/galaxy.yml.interactivetools similarity index 84% rename from config/galaxy.yml.realtime rename to config/galaxy.yml.interactivetools index 5b0bea4e396..6b196a42dbe 100644 --- a/config/galaxy.yml.realtime +++ b/config/galaxy.yml.interactivetools @@ -12,8 +12,8 @@ uwsgi: module: galaxy.webapps.galaxy.buildapp:uwsgi_app() - realtime_map: database/realtime_map.sqlite - python-raw: scripts/realtime/key_type_token_mapping.py + interactivetools_map: database/interactivetools_map.sqlite + python-raw: scripts/interactivetools/key_type_token_mapping.py route-host: ^([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.([A-Za-z0-9]+(?:-[A-Za-z0-9]+)*)\.(realtime\.localhost:8080)$ goto:realtime route-run: goto:endendend route-label: realtime @@ -28,8 +28,8 @@ galaxy: # outputs_to_working_directory will provide you with a better level of isolation. It is highly recommended to set # this parameter with InteractiveTools. outputs_to_working_directory: true - realtime_prefix: realtime - realtime_map: database/realtime_map.sqlite + interactivetools_prefix: realtime + interactivetools_map: database/interactivetools_map.sqlite # If you develop InteractiveTools locally and do not have a full FQDN you can # use an arbritrary one, e.g. 'my-hostname' here, if you set this hostname in your # job_conf.xml as well (see the corresponding comment). diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py index dcf693a4fff..e534d592f2a 100644 --- a/lib/galaxy/config/__init__.py +++ b/lib/galaxy/config/__init__.py @@ -708,8 +708,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration): self.fluent_log = string_as_bool(kwargs.get('fluent_log', False)) self.fluent_host = kwargs.get('fluent_host', 'localhost') self.fluent_port = int(kwargs.get('fluent_port', 24224)) - # RealTimeTools propagator mapping file - self.realtime_map = self.resolve_path(kwargs.get("realtime_map", "database/realtime_map.sqlite")) + # directory where the visualization registry searches for plugins self.visualization_plugins_directory = kwargs.get( 'visualization_plugins_directory', 'config/plugins/visualizations') @@ -736,7 +735,9 @@ class GalaxyAppConfiguration(BaseAppConfiguration): self.dynamic_proxy_golang_docker_address = kwargs.get("dynamic_proxy_golang_docker_address", "unix:///var/run/docker.sock") self.dynamic_proxy_golang_api_key = kwargs.get("dynamic_proxy_golang_api_key", None) - self.realtime_prefix = kwargs.get("realtime_prefix", "realtime") + # InteractiveTools propagator mapping file + self.realtime_map = self.resolve_path(kwargs.get("interactivetools_map", "database/interactivetools_map.sqlite")) + self.realtime_prefix = kwargs.get("interactivetools_prefix", "realtime") self.interactivetools_enable = string_as_bool(kwargs.get('interactivetools_enable', False)) # Default chunk size for chunkable datatypes -- 64k diff --git a/scripts/realtime/key_type_token_mapping.py b/scripts/interactivetools/key_type_token_mapping.py similarity index 98% rename from scripts/realtime/key_type_token_mapping.py rename to scripts/interactivetools/key_type_token_mapping.py index 3461c5c5783..fdbaa499e84 100644 --- a/scripts/realtime/key_type_token_mapping.py +++ b/scripts/interactivetools/key_type_token_mapping.py @@ -6,7 +6,7 @@ from time import time import uwsgi -realtime_db_file = uwsgi.opt["realtime_map"] +realtime_db_file = uwsgi.opt["interactivetools_map"] db_conn = sqlite3.connect(realtime_db_file)