From e3cdeb3244968309597736dd691c3fe4b9481687 Mon Sep 17 00:00:00 2001 From: Oleksii Kliukin Date: Fri, 5 Aug 2016 10:55:38 +0200 Subject: [PATCH] Address code review. --- patroni/ctl.py | 8 ++++---- patroni/dcs/consul.py | 8 ++++---- patroni/dcs/etcd.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patroni/ctl.py b/patroni/ctl.py index 26cead8a..ba8eca01 100644 --- a/patroni/ctl.py +++ b/patroni/ctl.py @@ -670,9 +670,9 @@ def touch_member(config, dcs): def set_defaults(config, cluster_name): ''' fill-in some basic configuration parameters if config file is not set ''' - config['postgresql']['name'] = config['postgresql'].get('name') or cluster_name - config['postgresql']['scope'] = config['postgresql'].get('scope') or cluster_name - config['postgresql']['listen'] = config['postgresql'].get('listen') or "127.0.0.1" + config['postgresql'].setdefault('name', cluster_name) + config['postgresql'].setdefault('scope', cluster_name) + config['postgresql'].setdefault('listen', '127.0.0.1') config['postgresql']['authentication'] = {'replication': None} config['restapi']['listen'] = ':' in config['restapi'].get('listen', ".") or '127.0.0.1:5432' @@ -702,4 +702,4 @@ def scaffold(cluster_name, config_file, dcs, sysid): except: dcs.delete_cluster() raise - click.echo("Cluster {0} has been created successfully".format(cluster_name, sysid)) + click.echo("Cluster {0} has been created successfully".format(cluster_name)) diff --git a/patroni/dcs/consul.py b/patroni/dcs/consul.py index 53ab1b1b..b2e15f76 100644 --- a/patroni/dcs/consul.py +++ b/patroni/dcs/consul.py @@ -191,8 +191,8 @@ class Consul(AbstractDCS): return True try: - args = {'cas': None} if kwargs.get('permanent') else {} - self._client.kv.put(self.member_path, data, acquire=self._session, **args) + args = {} if kwargs.get('permanent') else {'acquire': self._session} + self._client.kv.put(self.member_path, data, **args) self._my_member_data = data return True except Exception: @@ -201,8 +201,8 @@ class Consul(AbstractDCS): @catch_consul_errors def attempt_to_acquire_leader(self, permanent=False): - args = {'cas': None} if permanent else {} - ret = self._client.kv.put(self.leader_path, self._name, acquire=self._session, **args) + args = {} if permanent else {'acquire': self._session} + ret = self._client.kv.put(self.leader_path, self._name, **args) if not ret: logger.info('Could not take out TTL lock') return ret diff --git a/patroni/dcs/etcd.py b/patroni/dcs/etcd.py index 3f9f2c3c..0116aeab 100644 --- a/patroni/dcs/etcd.py +++ b/patroni/dcs/etcd.py @@ -282,7 +282,7 @@ class Etcd(AbstractDCS): @catch_etcd_errors def touch_member(self, data, ttl=None, permanent=False): - return self.retry(self._client.set, self.member_path, data, (ttl or self._ttl) if not permanent else None) + return self.retry(self._client.set, self.member_path, data, None if permanent else ttl or self._ttl) @catch_etcd_errors def take_leader(self): @@ -293,7 +293,7 @@ class Etcd(AbstractDCS): return bool(self.retry(self._client.write, self.leader_path, self._name, - ttl=self._ttl if permanent else None, + ttl=None if permanent else self._ttl, prevExist=False)) except etcd.EtcdAlreadyExist: logger.info('Could not take out TTL lock')