From b7c73fdba8d2de0113c3a5aa8021d18ea925782a Mon Sep 17 00:00:00 2001
From: Alexander Kukushkin <alexander.kukushkin@zalando.de>
Date: Tue, 23 Jun 2015 14:07:00 +0200
Subject: [PATCH] Rename hostname to name in a Member

---
 governor.py           | 2 +-
 helpers/etcd.py       | 6 +++---
 helpers/ha.py         | 2 +-
 helpers/postgresql.py | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/governor.py b/governor.py
index ba48fefd..d8a1e620 100755
--- a/governor.py
+++ b/governor.py
@@ -29,7 +29,7 @@ class Governor:
         if self.ha.cluster:
             for m in self.ha.cluster.members:
                 # Do not update member TTL when it is far from being expired
-                if m.hostname == self.postgresql.name and m.real_ttl() > self.shutdown_member_ttl:
+                if m.name == self.postgresql.name and m.real_ttl() > self.shutdown_member_ttl:
                     return True
         return self.etcd.touch_member(self.postgresql.name, connection_string, ttl)
 
diff --git a/helpers/etcd.py b/helpers/etcd.py
index f63cc364..0a1f7cb7 100644
--- a/helpers/etcd.py
+++ b/helpers/etcd.py
@@ -19,7 +19,7 @@ else:
 logger = logging.getLogger(__name__)
 
 
-class Member(namedtuple('Member', 'hostname,conn_url,api_url,expiration,ttl')):
+class Member(namedtuple('Member', 'name,conn_url,api_url,expiration,ttl')):
 
     @staticmethod
     def fromNode(node):
@@ -37,7 +37,7 @@ class Member(namedtuple('Member', 'hostname,conn_url,api_url,expiration,ttl')):
 class Cluster(namedtuple('Cluster', 'initialize,leader,last_leader_operation,members')):
 
     def is_unlocked(self):
-        return not (self.leader and self.leader.hostname)
+        return not (self.leader and self.leader.name)
 
 
 class Client:
@@ -268,7 +268,7 @@ class Etcd:
                 node = self.find_node(response['node'], '/leader')
                 if node:
                     for m in members:
-                        if m.hostname == node['value']:
+                        if m.name == node['value']:
                             leader = m
                             break
                     if not leader:
diff --git a/helpers/ha.py b/helpers/ha.py
index 9617228f..0453686e 100644
--- a/helpers/ha.py
+++ b/helpers/ha.py
@@ -23,7 +23,7 @@ class Ha:
         return self.etcd.update_leader(self.state_handler)
 
     def has_lock(self):
-        lock_owner = self.cluster.leader and self.cluster.leader.hostname
+        lock_owner = self.cluster.leader and self.cluster.leader.name
         logger.info('Lock owner: %s; I am %s', lock_owner, self.state_handler.name)
         return lock_owner == self.state_handler.name
 
diff --git a/helpers/postgresql.py b/helpers/postgresql.py
index 3d2cd183..861074e8 100644
--- a/helpers/postgresql.py
+++ b/helpers/postgresql.py
@@ -182,7 +182,7 @@ class Postgresql:
             return False
 
         for member in cluster.members:
-            if member.hostname == self.name:
+            if member.name == self.name:
                 continue
             try:
                 r = parseurl(member.conn_url)
@@ -195,7 +195,7 @@ class Postgresql:
                 row = member_cursor.fetchone()
                 member_cursor.close()
                 member_conn.close()
-                logger.error([self.name, member.hostname, row])
+                logger.error([self.name, member.name, row])
                 if not row[0] or row[1] < 0:
                     return False
             except psycopg2.Error:
@@ -269,7 +269,7 @@ primary_conninfo = '{}'
         self.members = [r[0] for r in cursor]
 
     def create_replication_slots(self, cluster):
-        members = [m.hostname for m in cluster.members if m.hostname != self.name]
+        members = [m.name for m in cluster.members if m.name != self.name]
         # drop unused slots
         for slot in set(self.members) - set(members):
             self.query("""SELECT pg_drop_replication_slot(%s)