From d536b4b62ac291f07ffdd84e21437ce46d1a7978 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Thu, 2 Jun 2016 16:45:17 +0200 Subject: [PATCH] Rollback changes regarding config_file It could be set only on the postgres command line anyway. --- patroni/postgresql.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/patroni/postgresql.py b/patroni/postgresql.py index d13b33f8..dd0409e8 100644 --- a/patroni/postgresql.py +++ b/patroni/postgresql.py @@ -51,7 +51,6 @@ class Postgresql(object): CMDLINE_OPTIONS = { 'listen_addresses': None, 'port': None, - 'config_file': None, 'wal_level': 'hot_standby', 'hot_standby': 'on', 'max_wal_senders': 5, @@ -454,8 +453,7 @@ class Postgresql(object): self.resolve_connection_addresses() options = ' '.join("--{0}='{1}'".format(p, self._server_parameters[p]) for p in self.CMDLINE_OPTIONS - if self._server_parameters[p] is not None and - not (self._major_version < 9.4 and p in ('max_replication_slots', 'wal_log_hints'))) + if not (self._major_version < 9.4 and p in ('max_replication_slots', 'wal_log_hints'))) ret = subprocess.call(self._pg_ctl + ['start', '-o', options], env=env, preexec_fn=os.setsid) == 0 self._pending_restart = False