From cfdfd967937b7592a438547e466fb9ca6f0b1042 Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Thu, 19 Mar 2020 13:26:59 +0100 Subject: [PATCH 1/3] Added support for PG port and options --- awx/main/dispatch/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py index 841f9344ae..300449a77e 100644 --- a/awx/main/dispatch/__init__.py +++ b/awx/main/dispatch/__init__.py @@ -75,7 +75,9 @@ def pg_bus_conn(): conn = psycopg2.connect(dbname=conf['NAME'], host=conf['HOST'], user=conf['USER'], - password=conf['PASSWORD']) + password=conf['PASSWORD'], + port=conf['PORT'], + **conf["OPTIONS"]) # Django connection.cursor().connection doesn't have autocommit=True on conn.set_session(autocommit=True) pubsub = PubSub(conn) From 3a208a0be27b842c6533836f09efec7084182628 Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Thu, 19 Mar 2020 13:26:59 +0100 Subject: [PATCH 2/3] Added support for PG port and options. related #6340 --- awx/main/dispatch/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py index 841f9344ae..300449a77e 100644 --- a/awx/main/dispatch/__init__.py +++ b/awx/main/dispatch/__init__.py @@ -75,7 +75,9 @@ def pg_bus_conn(): conn = psycopg2.connect(dbname=conf['NAME'], host=conf['HOST'], user=conf['USER'], - password=conf['PASSWORD']) + password=conf['PASSWORD'], + port=conf['PORT'], + **conf["OPTIONS"]) # Django connection.cursor().connection doesn't have autocommit=True on conn.set_session(autocommit=True) pubsub = PubSub(conn) From f858eda6b163335110ead75228838d77ddeac06f Mon Sep 17 00:00:00 2001 From: Egor Margineanu Date: Thu, 19 Mar 2020 13:43:06 +0100 Subject: [PATCH 3/3] Made OPTIONS optional --- awx/main/dispatch/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/dispatch/__init__.py b/awx/main/dispatch/__init__.py index 300449a77e..d368b7cc96 100644 --- a/awx/main/dispatch/__init__.py +++ b/awx/main/dispatch/__init__.py @@ -77,7 +77,7 @@ def pg_bus_conn(): user=conf['USER'], password=conf['PASSWORD'], port=conf['PORT'], - **conf["OPTIONS"]) + **conf.get("OPTIONS", {})) # Django connection.cursor().connection doesn't have autocommit=True on conn.set_session(autocommit=True) pubsub = PubSub(conn)