Merge pull request #419 from sbesson/omero_tables_module

admin rewrite: make OMERO.tables module configurable
ome · Jul 12, 2024 · 4b9ff25 · 4b9ff25
2 parents 8d8108d + 0d8fc4a
commit 4b9ff25
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/omero/install/config_parser.py b/src/omero/install/config_parser.py
@@ -48,6 +48,7 @@ def get_reference(self):
 PERFORMANCE_HEADER = Header("Performance", reference="performance")
 SCRIPTS_HEADER = Header("Scripts", reference="scripts")
 SECURITY_HEADER = Header("Security", reference="security")
+TABLES_HEADER = Header("Tables", reference="tables")
 
 HEADER_MAPPING = {
     "omero.data": FS_HEADER,
@@ -66,6 +67,7 @@ def get_reference(self):
     "omero.process": SCRIPTS_HEADER,
     "omero.scripts": SCRIPTS_HEADER,
     "omero.security": SECURITY_HEADER,
+    "omero.tables": TABLES_HEADER,
     "omero.resetpassword": SECURITY_HEADER,
     "omero.upgrades": MISC_HEADER,
     "Ice": ICE_HEADER,

diff --git a/src/omero/plugins/admin.py b/src/omero/plugins/admin.py
@@ -1198,7 +1198,9 @@ def clear_tail(elem):
             '@omero.ports.registry@': config.get(
                 'omero.ports.registry', '4061'),
             '@omero.master.host@': config.get('omero.master.host', config.get(
-                'Ice.Default.Host', '127.0.0.1'))
+                'Ice.Default.Host', '127.0.0.1')),
+            "@omero.tables.module@": config.get(
+                "omero.tables.module", "runTables")
             }
 
         client_transports = config.get('omero.client.icetransports', 'ssl,tcp')