From 7ab366a7356230b68c65da88010d333aff44ad77 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Wed, 10 Feb 2016 10:26:22 +0100 Subject: [PATCH 1/3] Fix psycopg2 username/user confusion. Make sure username is translated into the user when calling psycopg2.connect. Also, fix the sample configuration files to use username everywhere. --- patroni/postgresql.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patroni/postgresql.py b/patroni/postgresql.py index 0e279402..5a6cb390 100644 --- a/patroni/postgresql.py +++ b/patroni/postgresql.py @@ -132,6 +132,8 @@ class Postgresql: if not self._connection or self._connection.closed != 0: r = parseurl('postgres://{}/postgres'.format(self.local_address)) r.update(self.superuser) + if r.get('username'): + r['user'] = r['username'] self._connection = psycopg2.connect(**r) self._connection.autocommit = True self.server_version = self._connection.server_version From a513893a1903b9d6e14be4e05ddd2d861d90884e Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Wed, 10 Feb 2016 10:29:21 +0100 Subject: [PATCH 2/3] Really fix the sample configuration files. --- postgres1.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres1.yml b/postgres1.yml index a8802226..c2d84ea0 100644 --- a/postgres1.yml +++ b/postgres1.yml @@ -63,7 +63,7 @@ postgresql: password: rep-pass network: 127.0.0.1/32 superuser: - user: postgres + username: postgres password: zalando admin: username: admin From 435eeeb85d141f87d343e28171647e7aae5eee87 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Wed, 10 Feb 2016 10:30:05 +0100 Subject: [PATCH 3/3] Add postgres2.yml as well. --- postgres2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgres2.yml b/postgres2.yml index 99e8b47e..33620823 100644 --- a/postgres2.yml +++ b/postgres2.yml @@ -63,7 +63,7 @@ postgresql: password: rep-pass network: 127.0.0.1/32 superuser: - user: postgres + username: postgres password: zalando admin: username: admin