Make qwc_config schema name configurable through QWC_CONFIG_SCHEMA ENV

qwc-services · Jul 31, 2024 · 022bbbd · 022bbbd
1 parent b3d4951
commit 022bbbd
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/server.py b/src/server.py
@@ -16,6 +16,8 @@
 from qwc_services_core.runtime_config import RuntimeConfig
 
 
+qwc_config_schema = os.getenv("QWC_CONFIG_SCHEMA", "qwc_config")
+
 # Flask application
 app = Flask(__name__)
 api = Api(app, version='1.0', title='Permalink API',
@@ -51,10 +53,10 @@ def db_conn():
     config = config_handler.tenant_config(tenant)
 
     db_url = config.get('db_url', 'postgresql:///?service=qwc_configdb')
-    permalinks_table = config.get('permalinks_table', 'qwc_config.permalinks')
+    permalinks_table = config.get('permalinks_table', qwc_config_schema + '.permalinks')
     user_permalink_table = config.get(
-        'user_permalink_table', 'qwc_config.user_permalinks')
-    user_bookmark_table = config.get('user_bookmark_table', 'qwc_config.user_bookmarks')
+        'user_permalink_table', qwc_config_schema + '.user_permalinks')
+    user_bookmark_table = config.get('user_bookmark_table', qwc_config_schema + '.user_bookmarks')
 
     db = db_engine.db_engine(db_url)
     return (db, permalinks_table, user_permalink_table, user_bookmark_table)