Skip to content

Commit

Permalink
Rename me->member (variable name was too confusing)
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Kukushkin committed Apr 22, 2016
1 parent e275a34 commit a18c878
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions patroni/zookeeper.py
Expand Up @@ -207,27 +207,26 @@ def initialize(self, create_new=True, sysid=""):

def touch_member(self, data, ttl=None):
cluster = self.cluster
me = cluster and ([m for m in cluster.members if m.name == self._name] or [None])[0]
member = cluster and ([m for m in cluster.members if m.name == self._name] or [None])[0]
path = self.member_path
data = data.encode('utf-8')
create = not me
if me and self._client.client_id is not None and me.session != self._client.client_id[0]:
if member and self._client.client_id is not None and member.session != self._client.client_id[0]:
try:
self._client.retry(self._client.delete, path)
except NoNodeError:
pass
except:
return False
create = True
member = None

if not create and data == self._my_member_data:
if member and data == self._my_member_data:
return True

try:
if create:
self._client.retry(self._client.create, path, data, makepath=True, ephemeral=True)
else:
if member:
self._client.retry(self._client.set, path, data)
else:
self._client.retry(self._client.create, path, data, makepath=True, ephemeral=True)
self._my_member_data = data
return True
except NodeExistsError:
Expand Down

0 comments on commit a18c878

Please sign in to comment.