diff options
| author | jamesmarshall24 <jamarsha@redhat.com> | 2024-06-27 19:26:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-27 19:26:30 +0200 |
| commit | 4e0d19914fc7dc754ba9bd74f3ed514574bf06c9 (patch) | |
| tree | 55aa393e9debf4279e9b9545d325edb7d5ad0ec7 /awx/main/wsrelay.py | |
| parent | Add TASK_MANAGER_LOCK_TIMEOUT (#15300) (diff) | |
| download | awx-4e0d19914fc7dc754ba9bd74f3ed514574bf06c9.tar.xz awx-4e0d19914fc7dc754ba9bd74f3ed514574bf06c9.zip | |
LISTENER_DATABASES clobbers DATABASES OPTIONS (#15306)
Do not overwrite DATABASES OPTIONS with LISTENER_DATABASES
Diffstat (limited to '')
| -rw-r--r-- | awx/main/wsrelay.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/awx/main/wsrelay.py b/awx/main/wsrelay.py index bedf68efb0..dced6c4e83 100644 --- a/awx/main/wsrelay.py +++ b/awx/main/wsrelay.py @@ -306,7 +306,8 @@ class WebSocketRelayManager(object): 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 |