LISTENER_DATABASES clobbers DATABASES OPTIONS (ansible#15306)

Do not overwrite DATABASES OPTIONS with LISTENER_DATABASES
djyasin · Sep 11, 2024 · afd5f7b · afd5f7b
1 parent b1b4e17
commit afd5f7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py
@@ -102,7 +102,8 @@ def create_listener_connection():
 
     # Apply overrides specifically for the listener connection
     for k, v in settings.LISTENER_DATABASES.get('default', {}).items():
-        conf[k] = v
+        if k != 'OPTIONS':
+            conf[k] = v
     for k, v in settings.LISTENER_DATABASES.get('default', {}).get('OPTIONS', {}).items():
         conf['OPTIONS'][k] = v
 

diff --git a/awx/main/wsrelay.py b/awx/main/wsrelay.py
@@ -306,7 +306,8 @@ async def run(self):
         database_conf['OPTIONS'] = deepcopy(database_conf.get('OPTIONS', {}))
 
         for k, v in settings.LISTENER_DATABASES.get('default', {}).items():
-            database_conf[k] = v
+            if k != 'OPTIONS':
+                database_conf[k] = v
         for k, v in settings.LISTENER_DATABASES.get('default', {}).get('OPTIONS', {}).items():
             database_conf['OPTIONS'][k] = v