more realtime to interactivetools name changes

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).

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

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)