Little more RealTimeTools cleanup.

lib/galaxy/managers/realtime.py

@@ -15,7 +15,7 @@ from galaxy.util.filelock import FileLock
 
 log = logging.getLogger(__name__)
 
-DATABASE_TABLE_NAME = 'gxrtproxy'
+DATABASE_TABLE_NAME = 'gxitproxy'
 
 
 class RealtimeSqlite(object):
@@ -127,20 +127,6 @@ class RealtimeSqlite(object):
         """
         return self.remove(key=self.encode_id(entry_point.id), key_type=entry_point.__class__.__name__.lower())
 
-    def remove_entry_points0(self, entry_points):
-        """Convenience method to easily remove entry_points.
-        """
-        rval = []
-        for entry_point in entry_points:
-            rval.append(self.remove_entry_point(entry_point))
-        return rval
-
-    def remove_realtime0(self, rtt):
-        """Convenience method to easily remove a RealTimeTool.
-        """
-        for ep in rtt.entry_points:
-            self.remove_entry_point(ep)
-
 
 class RealTimeManager(object):
     """
@@ -258,9 +244,6 @@ class RealTimeManager(object):
             return False
         return True
 
-    def remove_realtime0(self, realtime):
-        return self.propagator.remove_realtime(realtime)
-
     def remove_entry_points(self, entry_points):
         if entry_points:
             for entry_point in entry_points:

scripts/interactivetools/key_type_token_mapping.py

@@ -9,6 +9,8 @@ import uwsgi
 realtime_db_file = uwsgi.opt["interactivetools_map"]
 db_conn = sqlite3.connect(realtime_db_file)
 
+DATABASE_TABLE_NAME = 'gxitproxy'
+
 
 class CacheEntry():
     def __init__(self, key, value, ttl=20):
@@ -70,7 +72,7 @@ def key_type_token_mapper(key, key_type, token, route_extra, url):
         for i in range(2):
             # Order by rowid gives us the last row added
             try:
-                row = db_conn.execute("select host, port from gxrtproxy where key=? and key_type=? and token=? order by rowid desc limit 1", (key, key_type, token)).fetchone()
+                row = db_conn.execute("select host, port from %s where key=? and key_type=? and token=? order by rowid desc limit 1" % (DATABASE_TABLE_NAME), (key, key_type, token)).fetchone()
                 if row:
                     rval = '%s:%s' % (tuple(row))
                     return rval.encode()