From 11b7cefa15062ef21769e373d28a156b861db9cc Mon Sep 17 00:00:00 2001 From: Pablo Carranza Date: Sat, 10 Jun 2017 23:35:23 +0200 Subject: Add password as a connection option --- prometheus_pgbouncer_exporter/utils.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'prometheus_pgbouncer_exporter/utils.py') diff --git a/prometheus_pgbouncer_exporter/utils.py b/prometheus_pgbouncer_exporter/utils.py index 7f9aae0..3a99695 100644 --- a/prometheus_pgbouncer_exporter/utils.py +++ b/prometheus_pgbouncer_exporter/utils.py @@ -14,12 +14,11 @@ import psycopg2 -def get_connection(user, port, host): +def get_connection(user=None, port=None, host=None, dbname='pgbouncer', password=None): + kwargs = { 'user': user, 'port': port, 'host': host, 'dbname': dbname, 'password': password } + kwargs = dict([(k, v) for k, v in kwargs.iteritems() if v]) connection = psycopg2.connect( - database='pgbouncer', - user=user, - port=port, - host=host, + **kwargs ) # pgbouncer does not support transactions (as it does not make sense to), -- cgit v1.2.3 From 730f895edee9a6201741b4e511c2572fcb56649d Mon Sep 17 00:00:00 2001 From: Pablo Carranza Date: Sat, 10 Jun 2017 23:45:51 +0200 Subject: Add one test, at least --- prometheus_pgbouncer_exporter/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'prometheus_pgbouncer_exporter/utils.py') diff --git a/prometheus_pgbouncer_exporter/utils.py b/prometheus_pgbouncer_exporter/utils.py index 3a99695..ea69f46 100644 --- a/prometheus_pgbouncer_exporter/utils.py +++ b/prometheus_pgbouncer_exporter/utils.py @@ -16,7 +16,7 @@ import psycopg2 def get_connection(user=None, port=None, host=None, dbname='pgbouncer', password=None): kwargs = { 'user': user, 'port': port, 'host': host, 'dbname': dbname, 'password': password } - kwargs = dict([(k, v) for k, v in kwargs.iteritems() if v]) + kwargs = dict([(k, v) for k, v in kwargs.items() if v]) connection = psycopg2.connect( **kwargs ) -- cgit v1.2.3