gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-08-25 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from zalando/bugfix/parameters

Browse Source 
Do not fail when there is no postgresql/parameters section in a config file
This commit is contained in:
Alexander Kukushkin
2015-11-16 10:13:52 +01:00
parent 5290792dff 9c16830fc0
commit 7d59a757fb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patroni/postgresql.py
+3 -2
View File
@@ -42,6 +42,7 @@ class Postgresql:
def __init__(self, config):
self.config = config
self.name = config['name']
self.server_parameters = config.get('parameters', {})
self.scope = config['scope']
self.listen_addresses, self.port = config['listen'].split(':')
self.data_dir = config['data_dir']
@@ -323,7 +324,7 @@ class Postgresql:
def server_options(self):
options = "--listen_addresses='{}' --port={}".format(self.listen_addresses, self.port)
for setting, value in self.config['parameters'].items():
for setting, value in self.server_parameters.items():
options += " --{}='{}'".format(setting, value)
return options
@@ -341,7 +342,7 @@ class Postgresql:
with open(os.path.join(self.data_dir, 'pg_hba.conf'), 'a') as f:
f.write('\nhost replication {username} {network} md5\n'.format(**self.replication))
for line in self.config.get('pg_hba', []):
if line.split()[0].strip() == 'hostssl' and self.config['parameters'].get('ssl', 'off').lower() != 'on':
if line.split()[0].strip() == 'hostssl' and self.server_parameters.get('ssl', 'off').lower() != 'on':
continue
f.write(line + '\n')